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

[Andreas Tille]

The following commit has been merged in the master branch:
commit f7a7c643425436dbea1a9a8aef675a35d69fff34
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jun 8 21:40:48 2013 +0200

    UNRELEASED packages because not yet uploaded to Debian

diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index 6a32411..bc2f46c 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -116,8 +116,9 @@ SELECT b.source,
     GROUP BY p.source
     ORDER BY p.source
   ) stable_bpo ON b.source = stable_bpo.source
- LEFT OUTER JOIN (
-  SELECT DISTINCT p.source, strip_binary_upload(MAX(v.version)) AS version
+ LEFT OUTER JOIN ( -- an 'UNRELEASED' version can be due to not yet finished work in VCS or not yet uploaded at all
+  SELECT DISTINCT source, version FROM (
+   SELECT DISTINCT p.source, strip_binary_upload(MAX(v.version)) AS version
     FROM packages p
     JOIN blends_dependencies b ON b.package = p.package
     -- make sure we get the right source version that does not necessarily match binary version
@@ -125,6 +126,12 @@ SELECT b.source,
     JOIN vcs v ON s.source = v.source
     WHERE b.blend = '$1' AND v.distribution = 'UNRELEASED'
     GROUP BY p.source
+   UNION
+   SELECT DISTINCT pr.source, strip_binary_upload(chlog_version) AS version
+    FROM blends_dependencies b
+    JOIN blends_prospectivepackages pr ON b.package = pr.package
+    WHERE b.blend = '$1'
+   ) tmp
   ) unreleased ON b.source = unreleased.source
  LEFT OUTER JOIN (
   SELECT DISTINCT u.source, strip_binary_upload(MAX(s.version)) AS version

-- 
Static and dynamic websites for Debian Pure Blends