From: Joerg Jaspert Date: Fri, 13 Mar 2009 16:20:53 +0000 (+0100) Subject: Merge commit 'stew/content_generation' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8ee81b67fbd35c771d8a3c18e53eb9f6e919ac47;hp=3b8c0bfd9b32e083c7fe0e175868ce4bd55a5209;p=dak.git Merge commit 'stew/content_generation' into merge * commit 'stew/content_generation': add import dbconn to database.py Signed-off-by: Joerg Jaspert --- diff --git a/daklib/database.py b/daklib/database.py index 3b5e9b54..190ab8db 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -33,6 +33,7 @@ import sys import time import types import utils +from dbconn import DBConn ################################################################################