]> err.no Git - dak/commitdiff
Avoid circular import when importing daklib.dbconn first.
authorChris Lamb <lamby@debian.org>
Tue, 27 Oct 2009 08:35:14 +0000 (08:35 +0000)
committerChris Lamb <lamby@debian.org>
Tue, 27 Oct 2009 08:35:14 +0000 (08:35 +0000)
Signed-off-by: Chris Lamb <lamby@debian.org>
daklib/dbconn.py

index cb578bd7874214576a7217b745771112cf805a2e..3aa7b8e2458965f152ede8dd57b361bc72bd338a 100755 (executable)
@@ -48,7 +48,6 @@ from sqlalchemy.orm.exc import NoResultFound
 
 # Only import Config until Queue stuff is changed to store its config
 # in the database
-import utils
 from config import Config
 from singleton import Singleton
 from textutils import fix_maintainer
@@ -1427,6 +1426,7 @@ class Queue(object):
                 # TODO: Move into database as above
                 if conf.FindB("Dinstall::SecurityQueueBuild"):
                     # Copy it since the original won't be readable by www-data
+                    import utils
                     utils.copy(src, dest)
                 else:
                     # Create a symlink to it