From: Chris Lamb <lamby@debian.org>
Date: Tue, 27 Oct 2009 08:35:14 +0000 (+0000)
Subject: Avoid circular import when importing daklib.dbconn first.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78c65f77acc9049e9c0f3a403ae95ff13b5ada0f;p=dak

Avoid circular import when importing daklib.dbconn first.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index cb578bd7..3aa7b8e2 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -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