Split a little function of of main()

diff --git a/ChangeLog b/ChangeLog
index eead3da3bcfc0b541efd1535f06d6401b3c600c3..e7e5ea822405b93b15e76572aed85fcefdc4a6e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
        * dak/clean_suites.py: likewise
        * dak/compare_suites.py: likewise
        * dak/cruft_report.py: likewise
+       (get_suite_binaries): Seperated in own function, out of main. More
+       of main should be splitted. (Or well, cruft_report redesigned a
+       little, so its easier to run on multiple suites with differing tests)
+
        * dak/examine_package.py: likewise
        * dak/find_null_maintainers.py: likewise
        * dak/generate_index_diffs.py: likewise

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 238cdd497463dbea6824437b4faa994940619eb5..cc5aa4b8520d946341ff61703c2aceb70a66cb9e 100755 (executable)
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -242,6 +242,20 @@ def do_obsolete_source(duplicate_bins, bin2source):
         print " dak rm -S -p -m \"[auto-cruft] obsolete source package\" %s" % (" ".join(to_remove))
         print
 
+def get_suite_binaries():
+    # Initalize a large hash table of all binary packages
+    binaries = {}
+    before = time.time()
+
+    sys.stderr.write("[Getting a list of binary packages in %s..." % (suite))
+    q = projectB.query("SELECT distinct b.package FROM binaries b, bin_associations ba WHERE ba.suite = %s AND ba.bin = b.id" % (suite_id))
+    ql = q.getresult()
+    sys.stderr.write("done. (%d seconds)]\n" % (int(time.time()-before)))
+    for i in ql:
+        binaries[i[0]] = ""
+
+    return binaries
+
 ################################################################################
 
 def main ():
@@ -294,14 +308,7 @@ def main ():
     bin_not_built = {}
 
     if "bnb" in checks:
-        # Initalize a large hash table of all binary packages
-        before = time.time()
-        sys.stderr.write("[Getting a list of binary packages in %s..." % (suite))
-        q = projectB.query("SELECT distinct b.package FROM binaries b, bin_associations ba WHERE ba.suite = %s AND ba.bin = b.id" % (suite_id))
-        ql = q.getresult()
-        sys.stderr.write("done. (%d seconds)]\n" % (int(time.time()-before)))
-        for i in ql:
-            bins_in_suite[i[0]] = ""
+        bins_in_suite = get_suite_binaries()
 
     # Checks based on the Sources files
     components = Cnf.ValueList("Suite::%s::Components" % (suite))

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
old mode 100755 (executable)
new mode 100644 (file)