X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=86c5f19018725352715d7e0d64aed4be64acb73c;hb=870e5fa80b2c9414b8a80bb968fec92a43888b4d;hp=f60c19b751b0317082626f4bbb47a7357273520c;hpb=06ce98c8111a8b09e5603dbbd34324a216412d69;p=dak.git

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index f60c19b7..86c5f190 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -26,8 +26,9 @@
 ################################################################################
 
 import pg, sys
-import dak.lib.database, dak.lib.utils
 import apt_pkg
+import daklib.database
+import daklib.utils
 
 ################################################################################
 
@@ -53,12 +54,12 @@ def fix_maintainer (maintainer):
     global fixed_maintainer_cache
 
     if not fixed_maintainer_cache.has_key(maintainer):
-        fixed_maintainer_cache[maintainer] = dak.lib.utils.fix_maintainer(maintainer)[0]
+        fixed_maintainer_cache[maintainer] = daklib.utils.fix_maintainer(maintainer)[0]
 
     return fixed_maintainer_cache[maintainer]
 
 def get_maintainer (maintainer):
-    return fix_maintainer(dak.lib.database.get_maintainer(maintainer))
+    return fix_maintainer(daklib.database.get_maintainer(maintainer))
 
 def get_maintainer_from_source (source_id):
     global maintainer_from_source_cache
@@ -75,7 +76,7 @@ def get_maintainer_from_source (source_id):
 def main():
     global Cnf, projectB
 
-    Cnf = dak.lib.utils.get_conf()
+    Cnf = daklib.utils.get_conf()
 
     Arguments = [('h',"help","Make-Maintainers::Options::Help")]
     if not Cnf.has_key("Make-Maintainers::Options::Help"):
@@ -88,7 +89,7 @@ def main():
         usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    dak.lib.database.init(Cnf, projectB)
+    daklib.database.init(Cnf, projectB)
 
     for suite in Cnf.SubTree("Suite").List():
         suite = suite.lower()
@@ -129,9 +130,9 @@ def main():
 
     # Process any additional Maintainer files (e.g. from non-US or pseudo packages)
     for filename in extra_files:
-        file = dak.lib.utils.open_file(filename)
+        file = daklib.utils.open_file(filename)
         for line in file.readlines():
-            line = dak.lib.utils.re_comments.sub('', line).strip()
+            line = daklib.utils.re_comments.sub('', line).strip()
             if line == "":
                 continue
             split = line.split()