From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 6 Sep 2011 20:40:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'ansgar/add-missing-source-checksums' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a221878898a1ce8839fbc3280f1286dc724067f3;hp=8eef1cfc770d01b357ac3a413f3ccd94c30065f7;p=dak.git

Merge remote-tracking branch 'ansgar/add-missing-source-checksums' into merge

* ansgar/add-missing-source-checksums:
  Move query for add-missing-source-checksums to Python code
  Add missing checksums for source packages.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/control_suite.py b/dak/control_suite.py
index d18bc705..9b1514d7 100755
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -122,7 +122,6 @@ def britney_changelog(packages, suite, session):
     for p in q.fetchall():
         current[p[0]] = p[1]
     for p in packages.keys():
-        p = p.split()
         if p[2] == "source":
             old[p[0]] = p[1]
 
diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index c6d4ade9..4b2a1d18 100755
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -293,10 +293,6 @@ def generate_translations(suite_id, component_id):
 #############################################################################
 
 def main():
-    from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
-    pool = DakProcessPool()
-
-    from daklib.dbconn import Component, DBConn, get_suite, Suite
     from daklib.config import Config
     from daklib import daklog
 
@@ -305,7 +301,8 @@ def main():
     Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
                  ('5','description-md5',"Generate-Packages-Sources::Options::Description-md5"),
                  ('s',"suite","Generate-Packages-Sources::Options::Suite"),
-                 ('f',"force","Generate-Packages-Sources::Options::Force")]
+                 ('f',"force","Generate-Packages-Sources::Options::Force"),
+                 ('o','option','','ArbItem')]
 
     suite_names = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
     try:
@@ -316,8 +313,12 @@ def main():
     if Options.has_key("Help"):
         usage()
 
+    from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
+    pool = DakProcessPool()
+
     logger = daklog.Logger('generate-packages-sources2')
 
+    from daklib.dbconn import Component, DBConn, get_suite, Suite
     session = DBConn().session()
     session.execute("SELECT add_missing_description_md5()")
     session.commit()