X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=8290cca32a61f03082bedec81dd3bc55a2294a2a;hb=83cd5dfad25f243cd0ee7a0c5f2b66eb18871e16;hp=4b2a1d182c040f85143c8da9fae34da41869fdee;hpb=a221878898a1ce8839fbc3280f1286dc724067f3;p=dak.git

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 4b2a1d18..8290cca3 100755
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -156,13 +156,20 @@ WITH
 
 SELECT
   (SELECT
-     STRING_AGG(key || '\: ' || value, E'\n' ORDER BY mk.ordering, mk.key)
+     STRING_AGG(key || '\: ' || value, E'\n' ORDER BY ordering, key)
    FROM
-     binaries_metadata bm
-     JOIN metadata_keys mk ON mk.key_id = bm.key_id
-   WHERE
-     bm.bin_id = tmp.binary_id
-     AND key != ALL (:metadata_skip)
+     (SELECT key, ordering,
+        CASE WHEN :include_long_description = 'false' AND key = 'Description'
+          THEN SUBSTRING(value FROM E'\\A[^\n]*')
+          ELSE value
+        END AS value
+      FROM
+        binaries_metadata bm
+        JOIN metadata_keys mk ON mk.key_id = bm.key_id
+      WHERE
+        bm.bin_id = tmp.binary_id
+        AND key != ALL (:metadata_skip)
+     ) AS metadata
   )
   || COALESCE(E'\n' || (SELECT
      STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key)
@@ -214,16 +221,15 @@ def generate_packages(suite_id, component_id, architecture_id, type_name, use_de
     architecture = session.query(Architecture).get(architecture_id)
 
     overridesuite_id = suite.get_overridesuite().suite_id
+    include_long_description = suite.include_long_description or not use_description_md5
 
     # We currently filter out the "Tag" line. They are set by external
     # overrides and NOT by the maintainer. And actually having it set by
     # maintainer means we output it twice at the moment -> which breaks
     # dselect.
     metadata_skip = ["Section", "Priority", "Tag"]
-    if suite.include_long_description or not use_description_md5:
+    if include_long_description:
         metadata_skip.append("Description-md5")
-    else:
-        metadata_skip.append("Description")
 
     writer = PackagesFileWriter(suite=suite.suite_name, component=component.component_name,
             architecture=architecture.arch_string, debtype=type_name)
@@ -231,7 +237,8 @@ def generate_packages(suite_id, component_id, architecture_id, type_name, use_de
 
     r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
         "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id,
-        "overridesuite": overridesuite_id, "metadata_skip": metadata_skip})
+        "overridesuite": overridesuite_id, "metadata_skip": metadata_skip,
+        "include_long_description": 'true' if include_long_description else 'false'})
     for (stanza,) in r:
         print >>output, stanza
         print >>output, ""
@@ -245,6 +252,13 @@ def generate_packages(suite_id, component_id, architecture_id, type_name, use_de
 #############################################################################
 
 _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
@@ -253,7 +267,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')