include Built-Using sources in Sources indices

Bug: http://bugs.debian.org/657212

diff --git a/dak/dakdb/update94.py b/dak/dakdb/update94.py
new file mode 100644 (file)
index 0000000..c635902
--- /dev/null
+++ b/dak/dakdb/update94.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+src_associations_full view
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2013, Ansgar Burchardt <ansgar@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from daklib.config import Config
+
+statements = [
+"""
+CREATE OR REPLACE VIEW src_associations_full AS
+SELECT
+  suite,
+  source,
+  BOOL_AND(extra_source) AS extra_source
+FROM
+  (SELECT sa.suite AS suite, sa.source AS source, FALSE AS extra_source
+     FROM src_associations sa
+   UNION
+   SELECT ba.suite AS suite, esr.src_id AS source_id, TRUE AS extra_source
+     FROM extra_src_references esr
+     JOIN bin_associations ba ON esr.bin_id = ba.bin)
+  AS tmp
+GROUP BY suite, source
+""",
+"""
+COMMENT ON VIEW src_associations_full IS
+  'view including all source packages for a suite, including those referenced by Built-Using'
+""",
+]
+
+################################################################################
+def do_update(self):
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        for stmt in statements:
+            c.execute(stmt)
+
+        c.execute("UPDATE config SET value = '94' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError as msg:
+        self.db.rollback()
+        raise DBUpdateError('Unable to apply sick update 94, rollback issued. Error message: {0}'.format(msg))

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 4cf8359abc245c3c728fb87fe86b9799aaeb6671..d941d98487d782996b4fafcf2006b2aeb32890c9 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -67,28 +67,35 @@ SELECT
    WHERE s.id=sm.src_id
   )
   ||
+  CASE
+    WHEN src_associations_full.extra_source THEN E'\nExtra-Source-Only\: yes'
+    ELSE ''
+  END
+  ||
   E'\nDirectory\: pool/' || :component_name || '/' || SUBSTRING(f.filename FROM E'\\A(.*)/[^/]*\\Z')
   ||
-  E'\nPriority\: ' || pri.priority
+  E'\nPriority\: ' || COALESCE(pri.priority, 'extra')
   ||
-  E'\nSection\: ' || sec.section
+  E'\nSection\: ' || COALESCE(sec.section, 'misc')
 
 FROM
 
 source s
-JOIN src_associations sa ON s.id = sa.source
+JOIN src_associations_full ON src_associations_full.suite = :suite AND s.id = src_associations_full.source
 JOIN files f ON s.file=f.id
 JOIN files_archive_map fam
   ON fam.file_id = f.id
      AND fam.archive_id = (SELECT archive_id FROM suite WHERE id = :suite)
      AND fam.component_id = :component
-JOIN override o ON o.package = s.source
-JOIN section sec ON o.section = sec.id
-JOIN priority pri ON o.priority = pri.id
+LEFT JOIN override o ON o.package = s.source
+                     AND o.suite = :overridesuite
+                     AND o.component = :component
+                     AND o.type = :dsc_type
+LEFT JOIN section sec ON o.section = sec.id
+LEFT JOIN priority pri ON o.priority = pri.id
 
 WHERE
-  sa.suite = :suite
-  AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type
+  (src_associations_full.extra_source OR o.suite IS NOT NULL)
 
 ORDER BY
 s.source, s.version

diff --git a/dak/update_db.py b/dak/update_db.py
index cf7f88f3d6958b6e2ce6ab56c5f0e9de82c1e28b..c07f1d1ec17822c8af864f5312eeb8337d0cf059 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -46,7 +46,7 @@ from daklib.daklog import Logger
 ################################################################################
 
 Cnf = None
-required_database_schema = 93
+required_database_schema = 94
 
 ################################################################################