Move lib to daklib to shut aj up.

[dak.git] / dak / make_suite_file_list.py

diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index ca1f98b893c20a30df78d62140f5163738c3cdd4..20fe186c5914376a08e30cd6181a2158f5b4d1f5 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -35,7 +35,10 @@
 
 import copy, os, pg, string, sys
 import apt_pkg
-import poolize, dak.lib.database, dak.lib.logging, dak.lib.utils
+import symlink_dists
+import daklib.database
+import daklib.logging
+import daklib.utils
 
 ################################################################################
 
@@ -73,7 +76,7 @@ def version_cmp(a, b):
 
 def delete_packages(delete_versions, pkg, dominant_arch, suite,
                     dominant_version, delete_table, delete_col, packages):
-    suite_id = dak.lib.database.get_suite_id(suite)
+    suite_id = daklib.database.get_suite_id(suite)
     for version in delete_versions:
         delete_unique_id = version[1]
         if not packages.has_key(delete_unique_id):
@@ -195,7 +198,7 @@ def cleanup(packages):
 def write_legacy_mixed_filelist(suite, list, packages, dislocated_files):
     # Work out the filename
     filename = os.path.join(Cnf["Dir::Lists"], "%s_-_all.list" % (suite))
-    output = dak.lib.utils.open_file(filename, "w")
+    output = daklib.utils.open_file(filename, "w")
     # Generate the final list of files
     files = {}
     for id in list:
@@ -207,7 +210,7 @@ def write_legacy_mixed_filelist(suite, list, packages, dislocated_files):
         else:
             filename = path + filename
         if files.has_key(filename):
-            dak.lib.utils.warn("%s (in %s) is duplicated." % (filename, suite))
+            daklib.utils.warn("%s (in %s) is duplicated." % (filename, suite))
         else:
             files[filename] = ""
     # Sort the files since apt-ftparchive doesn't
@@ -228,7 +231,7 @@ def write_filelist(suite, component, arch, type, list, packages, dislocated_file
         elif type == "deb":
             arch = "binary-%s" % (arch)
     filename = os.path.join(Cnf["Dir::Lists"], "%s_%s_%s.list" % (suite, component, arch))
-    output = dak.lib.utils.open_file(filename, "w")
+    output = daklib.utils.open_file(filename, "w")
     # Generate the final list of files
     files = {}
     for id in list:
@@ -241,7 +244,7 @@ def write_filelist(suite, component, arch, type, list, packages, dislocated_file
         else:
             filename = path + filename
         if files.has_key(pkg):
-            dak.lib.utils.warn("%s (in %s/%s, %s) is duplicated." % (pkg, suite, component, filename))
+            daklib.utils.warn("%s (in %s/%s, %s) is duplicated." % (pkg, suite, component, filename))
         else:
             files[pkg] = filename
     # Sort the files since apt-ftparchive doesn't
@@ -271,13 +274,13 @@ def write_filelists(packages, dislocated_files):
     if not Options["Suite"]:
         suites = Cnf.SubTree("Suite").List()
     else:
-        suites = dak.lib.utils.split_args(Options["Suite"])
+        suites = daklib.utils.split_args(Options["Suite"])
     for suite in map(string.lower, suites):
         d.setdefault(suite, {})
         if not Options["Component"]:
             components = Cnf.ValueList("Suite::%s::Components" % (suite))
         else:
-            components = dak.lib.utils.split_args(Options["Component"])
+            components = daklib.utils.split_args(Options["Component"])
         udeb_components = Cnf.ValueList("Suite::%s::UdebComponents" % (suite))
         udeb_components = udeb_components
         for component in components:
@@ -289,7 +292,7 @@ def write_filelists(packages, dislocated_files):
             if not Options["Architecture"]:
                 architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite))
             else:
-                architectures = dak.lib.utils.split_args(Options["Architectures"])
+                architectures = daklib.utils.split_args(Options["Architectures"])
             for arch in map(string.lower, architectures):
                 d[suite][component].setdefault(arch, {})
                 if arch == "source":
@@ -339,7 +342,7 @@ def stable_dislocation_p():
     if not Options["Suite"]:
         return 1
     # Otherwise, look in what suites the user specified
-    suites = dak.lib.utils.split_args(Options["Suite"])
+    suites = daklib.utils.split_args(Options["Suite"])
 
     if "stable" in suites:
         return 1
@@ -352,16 +355,16 @@ def do_da_do_da():
     # If we're only doing a subset of suites, ensure we do enough to
     # be able to do arch: all mapping.
     if Options["Suite"]:
-        suites = dak.lib.utils.split_args(Options["Suite"])
+        suites = daklib.utils.split_args(Options["Suite"])
         for suite in suites:
             archall_suite = Cnf.get("Make-Suite-File-List::ArchAllMap::%s" % (suite))
             if archall_suite and archall_suite not in suites:
-                dak.lib.utils.warn("Adding %s as %s maps Arch: all from it." % (archall_suite, suite))
+                daklib.utils.warn("Adding %s as %s maps Arch: all from it." % (archall_suite, suite))
                 suites.append(archall_suite)
         Options["Suite"] = ",".join(suites)
     
     (con_suites, con_architectures, con_components, check_source) = \
-                 dak.lib.utils.parse_args(Options)
+                 daklib.utils.parse_args(Options)
 
     if stable_dislocation_p():
         dislocated_files = symlink_dists.find_dislocated_stable(Cnf, projectB)
@@ -405,7 +408,7 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
 def main():
     global Cnf, projectB, Options, Logger
 
-    Cnf = dak.lib.utils.get_conf()
+    Cnf = daklib.utils.get_conf()
     Arguments = [('a', "architecture", "Make-Suite-File-List::Options::Architecture", "HasArg"),
                  ('c', "component", "Make-Suite-File-List::Options::Component", "HasArg"),
                  ('h', "help", "Make-Suite-File-List::Options::Help"),
@@ -420,8 +423,8 @@ def main():
         usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    dak.lib.database.init(Cnf, projectB)
-    Logger = dak.lib.logging.Logger(Cnf, "make-suite-file-list")
+    daklib.database.init(Cnf, projectB)
+    Logger = daklib.logging.Logger(Cnf, "make-suite-file-list")
     do_da_do_da()
     Logger.close()