From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 28 Oct 2009 20:07:00 +0000 (+0100)
Subject: Merge commit 'lamby/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7546dff3f04e1d108837b762ee860bd6bba922c2;hp=4d95e00f8cb7e56adec4675211b5c1828f05e367;p=dak.git

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Haha, recursive import

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index eee5cfc2..c926ae3d 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -51,7 +51,6 @@ from sqlalchemy.orm.exc import NoResultFound
 from config import Config
 from singleton import Singleton
 from textutils import fix_maintainer
-from utils import ensure_orig_files
 
 ################################################################################
 
@@ -1415,6 +1414,7 @@ class Queue(object):
 
                 session.add(qb)
 
+            from utils import ensure_orig_files
             exists, symlinked = ensure_orig_files(changes, dest, session)
 
             # Add symlinked files to the list of packages for later processing