Use overridesuite when joining override table.

[dak.git] / dak / generate_packages_sources2.py

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 42aa7abb5af615cfd6924a0b5a73fe2cc78ee901..46cb78387a7dee12f0c8de6e3cbae9e2996c3c14 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -38,6 +38,11 @@ Generate the Packages/Sources files
                                Default: All suites not marked 'untouchable'
   -f, --force                  Allow processing of untouchable suites
                                CAREFUL: Only to be used at point release time!
+  -5, --description-md5        Allow to use Description-md5 instead of
+                               Description for Packages index and generate
+                               Translation-en
+                               NOTE: suite.include_long_descriptions needs to
+                               be set to false for this.
   -h, --help                   show this help and exit
 
 SUITE can be a space seperated list, e.g.
@@ -194,7 +199,7 @@ WHERE
 ORDER BY tmp.source, tmp.package, tmp.version
 """
 
-def generate_packages(suite_id, component_id, architecture_id, type_name):
+def generate_packages(suite_id, component_id, architecture_id, type_name, use_description_md5):
     global _packages_query
     from daklib.filewriter import PackagesFileWriter
     from daklib.dbconn import Architecture, Component, DBConn, OverrideType, Suite
@@ -215,7 +220,7 @@ def generate_packages(suite_id, component_id, architecture_id, type_name):
     # maintainer means we output it twice at the moment -> which breaks
     # dselect.
     metadata_skip = ["Section", "Priority", "Tag"]
-    if suite.include_long_description:
+    if suite.include_long_description or not use_description_md5:
         metadata_skip.append("Description-md5")
     else:
         metadata_skip.append("Description")
@@ -240,6 +245,13 @@ def generate_packages(suite_id, component_id, architecture_id, type_name):
 #############################################################################
 
 _translations_query = """
+WITH
+  override_suite AS
+    (SELECT
+      s.id AS id,
+      COALESCE(os.id, s.id) AS overridesuite_id
+      FROM suite AS s LEFT JOIN suite AS os ON s.overridesuite = os.suite_name)
+
 SELECT
      'Package\: ' || b.package
   || E'\nDescription-md5\: ' || bm_description_md5.value
@@ -248,7 +260,8 @@ SELECT
 FROM binaries b
   -- join tables for suite and component
   JOIN bin_associations ba ON b.id = ba.bin
-  JOIN override o ON b.package = o.package AND o.suite = :suite AND o.type = (SELECT id FROM override_type WHERE type = 'deb')
+  JOIN override_suite os ON os.id = ba.suite
+  JOIN override o ON b.package = o.package AND o.suite = os.overridesuite_id AND o.type = (SELECT id FROM override_type WHERE type = 'deb')
 
   -- join tables for Description and Description-md5
   JOIN binaries_metadata bm_description ON b.id = bm_description.bin_id AND bm_description.key_id = (SELECT key_id FROM metadata_keys WHERE key = 'Description')
@@ -288,18 +301,16 @@ 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
 
     cnf = Config()
 
     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:
@@ -310,8 +321,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()
@@ -328,6 +343,7 @@ def main():
     else:
         suites = session.query(Suite).filter(Suite.untouchable == False).all()
 
+    use_description_md5 = Options.has_key("Description-md5") and Options["Description-md5"]
     force = Options.has_key("Force") and Options["Force"]
 
     component_ids = [ c.component_id for c in session.query(Component).all() ]
@@ -347,12 +363,13 @@ def main():
             utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
         for c in component_ids:
             pool.apply_async(generate_sources, [s.suite_id, c], callback=parse_results)
-            pool.apply_async(generate_translations, [s.suite_id, c], callback=parse_results)
+            if use_description_md5 and not s.include_long_description:
+                pool.apply_async(generate_translations, [s.suite_id, c], callback=parse_results)
             for a in s.architectures:
                 if a == 'source':
                     continue
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=parse_results)
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=parse_results)
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb', use_description_md5], callback=parse_results)
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb', use_description_md5], callback=parse_results)
 
     pool.close()
     pool.join()