[Blends-commit] [SCM] website branch, master, updated. 193d2867814d8a54c22082705237e67a214ed2cd

[Andreas Tille]

The following commit has been merged in the master branch:
commit 3b39b37e71c7d7b2299bfd7114f878722bed2ae9
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jun 2 19:25:44 2013 +0200

    Make sure we get really all source packages specified by the Blends dependencies regardless they are available in unstable or not

diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index 77b118d..0f004ba 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -9,13 +9,18 @@ fi
 # name in stable or testing that is different from the name in unstable
 
 psql udd >$1.out <<EOT
-SELECT unstable.source,
+SELECT b.source,
        stable.version AS stable,
        testing.version AS testing,
        unstable.version AS unstable,
        d.unstable_upstream AS upstream,
        d.unstable_status AS status
  FROM (
+  SELECT DISTINCT p.source FROM packages p
+  JOIN blends_dependencies bd ON bd.package = p.package
+  WHERE bd.blend = '$1'
+ ) b
+ LEFT OUTER JOIN (
   SELECT DISTINCT p.source, strip_binary_upload(MAX(s.version)) AS version
     FROM packages p
     JOIN releases r ON p.release = r.release
@@ -25,7 +30,7 @@ SELECT unstable.source,
     WHERE b.blend = '$1' AND r.role = 'unstable' AND p.distribution = 'debian'
     GROUP BY p.source
     ORDER BY p.source
-  ) unstable
+  ) unstable ON b.source = unstable.source
  LEFT OUTER JOIN (
   SELECT DISTINCT p.source, strip_binary_upload(MAX(s.version)) AS version
     FROM packages p
@@ -36,7 +41,7 @@ SELECT unstable.source,
     WHERE b.blend = '$1' AND r.role = 'testing' AND p.distribution = 'debian'
     GROUP BY p.source
     ORDER BY p.source
-  ) testing ON unstable.source = testing.source
+  ) testing ON b.source = testing.source
  LEFT OUTER JOIN (
   SELECT DISTINCT p.source, strip_binary_upload(MAX(s.version)) AS version
     FROM packages p
@@ -47,9 +52,9 @@ SELECT unstable.source,
     WHERE b.blend = '$1' AND r.role = 'stable' AND p.distribution = 'debian'
     GROUP BY p.source
     ORDER BY p.source
-  ) stable ON unstable.source = stable.source
-  LEFT OUTER JOIN dehs d ON unstable.source = d.source
-  ORDER BY unstable.source
+  ) stable ON b.source = stable.source
+  LEFT OUTER JOIN dehs d ON b.source = d.source
+  ORDER BY b.source
 ;
 
 EOT

-- 
Static and dynamic websites for Debian Pure Blends