Merge branch 'psycopg2' into content_generation

[dak.git] / dak / check_proposed_updates.py

diff --git a/dak/check_proposed_updates.py b/dak/check_proposed_updates.py
index a4e7c0cb7c36b1344e3b3a7ddc7f3af5820dadd1..5b9283f712e3cee0d54711991ec795cb2c760ea8 100755 (executable)
--- a/dak/check_proposed_updates.py
+++ b/dak/check_proposed_updates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Dependency check proposed-updates
+""" Dependency check proposed-updates """
 # Copyright (C) 2001, 2002, 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -30,8 +30,9 @@
 
 import pg, sys, os
 import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
+from daklib.regexes import re_no_epoch
 
 ################################################################################
 
@@ -91,7 +92,7 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                             unsat = 0
                             break
                 # As part of the same .changes?
-                epochless_version = utils.re_no_epoch.sub('', version)
+                epochless_version = re_no_epoch.sub('', version)
                 dep_filename = "%s_%s_%s.deb" % (dep, epochless_version, arch)
                 if files.has_key(dep_filename):
                     if Options["debug"]: