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 eee5cfc2f82e9718b62387eace4eaf4dd39d0629..c926ae3db6856785807a380a23c21e4846638041 100755 (executable)
--- 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