X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=55cc4a9b6324b020efa6b9658914df065798bca2;hb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;hp=c3905af933d51d77a5ebdf7e99abe01952cfb8f7;hpb=ba3d9a19a9fdc6c316f2558ab6f2c2b68b67a7b9;p=dak.git

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index c3905af9..55cc4a9b 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -27,8 +27,9 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
+from daklib.regexes import re_comments
 
 ################################################################################
 
@@ -130,9 +131,9 @@ def main():
 
     # Process any additional Maintainer files (e.g. from pseudo packages)
     for filename in extra_files:
-        file = utils.open_file(filename)
-        for line in file.readlines():
-            line = utils.re_comments.sub('', line).strip()
+        extrafile = utils.open_file(filename)
+        for line in extrafile.readlines():
+            line = re_comments.sub('', line).strip()
             if line == "":
                 continue
             split = line.split()
@@ -147,7 +148,7 @@ def main():
             if not packages.has_key(package) or version == '*' \
                or apt_pkg.VersionCompare(packages[package]["version"], version) < 0:
                 packages[package] = { "maintainer": maintainer, "version": version }
-        file.close()
+        extrafile.close()
 
     package_keys = packages.keys()
     package_keys.sort()