Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / generate_packages_sources2.py

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index e44d9ceeca424c2148904c6e660916d03046260d..51d8e9b8d8f894fdb832d113122e81c1c459c9c0 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -56,11 +56,11 @@ SELECT
      STRING_AGG(
        CASE
          WHEN key = 'Source' THEN E'Package\: '
-         WHEN key = 'Files' AND sui.checksums && array['md5sum'] THEN E'Files\:\n ' || f.md5sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+         WHEN key = 'Files' AND suite.checksums && array['md5sum'] THEN E'Files\:\n ' || f.md5sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
          WHEN key = 'Files' THEN NULL
-         WHEN key = 'Checksums-Sha1' AND sui.checksums && array['sha1'] THEN E'Checksums-Sha1\:\n ' || f.sha1sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+         WHEN key = 'Checksums-Sha1' AND suite.checksums && array['sha1'] THEN E'Checksums-Sha1\:\n ' || f.sha1sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
          WHEN key = 'Checksums-Sha1' THEN NULL
-         WHEN key = 'Checksums-Sha256' AND sui.checksums && array['sha256'] THEN E'Checksums-Sha256\:\n ' || f.sha256sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
+         WHEN key = 'Checksums-Sha256' AND suite.checksums && array['sha256'] THEN E'Checksums-Sha256\:\n ' || f.sha256sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
          WHEN key = 'Checksums-Sha256' THEN NULL
          ELSE key || E'\: '
        END || value, E'\n' ORDER BY mk.ordering, mk.key)
@@ -96,7 +96,7 @@ LEFT JOIN override o ON o.package = s.source
                      AND o.type = :dsc_type
 LEFT JOIN section sec ON o.section = sec.id
 LEFT JOIN priority pri ON o.priority = pri.id
-LEFT JOIN suite sui on sui.id = :suite
+LEFT JOIN suite on suite.id = :suite
 
 ORDER BY
 s.source, s.version
@@ -205,9 +205,9 @@ SELECT
   || E'\nPriority\: ' || COALESCE(pri.priority, tmp.fallback_priority)
   || E'\nFilename\: pool/' || :component_name || '/' || tmp.filename
   || E'\nSize\: ' || tmp.size
-  || E'\nMD5sum\: ' || tmp.md5sum
-  || E'\nSHA1\: ' || tmp.sha1sum
-  || E'\nSHA256\: ' || tmp.sha256sum
+  || CASE WHEN suite.checksums && array['md5sum'] THEN E'\nMD5sum\: ' || tmp.md5sum ELSE '' END
+  || CASE WHEN suite.checksums && array['sha1'] THEN E'\nSHA1\: ' || tmp.sha1sum ELSE '' END
+  || CASE WHEN suite.checksums && array['sha256'] THEN E'\nSHA256\: ' || tmp.sha256sum ELSE '' END
 
 FROM
   tmp
@@ -217,6 +217,7 @@ FROM
                       AND o.component = :component
   LEFT JOIN section sec ON sec.id = o.section
   LEFT JOIN priority pri ON pri.id = o.priority
+  LEFT JOIN suite ON suite.id = :suite
 
 WHERE
   (
@@ -356,11 +357,11 @@ def main():
 
     Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
                  ('a','archive','Generate-Packages-Sources::Options::Archive','HasArg'),
-                 ('s',"suite","Generate-Packages-Sources::Options::Suite"),
+                 ('s',"suite","Generate-Packages-Sources::Options::Suite",'HasArg'),
                  ('f',"force","Generate-Packages-Sources::Options::Force"),
                  ('o','option','','ArbItem')]
 
-    suite_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
     try:
         Options = cnf.subtree("Generate-Packages-Sources::Options")
     except KeyError:
@@ -381,6 +382,7 @@ def main():
 
     if Options.has_key("Suite"):
         suites = []
+        suite_names = Options['Suite'].split(',')
         for s in suite_names:
             suite = get_suite(s.lower(), session)
             if suite: