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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 5f8018f63939b726dd42718bb86fb4be3ad5311a
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 29 11:20:21 2015 +0200

    Add debianstatus to test script

diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index f37eb55..f0c3780 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -46,12 +46,26 @@ SELECT b.source,
        precise.version AS precise,
        quantal.version AS quantal,
        raring.version AS raring,
-       d.unstable_upstream AS upstream,
-       d.unstable_status AS status,
-       CASE WHEN d.unstable_status IS NOT NULL THEN CAST(unstable_status AS text) ELSE 'none' END AS upstreamstatus,
+       d.upstream_version AS upstream,
+       -- map values from former dehs to upstream table values
+       CASE WHEN d.status IS NULL OR
+                 d.status = '' OR
+                 d.status = 'error'                                 THEN 'none'
+            WHEN d.status = 'Newer version available'               THEN 'outdated'
+            WHEN d.status = 'up to date'                            THEN 'upToDate'
+            WHEN d.status = 'Debian version newer than remote site' THEN 'newer-in-debian'
+            ELSE 'unknown' -- should not occure!
+       END AS upstreamstatus,
        homepage,
        wnpp,
-       tasks.tasks
+       tasks.tasks,
+       CASE WHEN stable.version >= unstable.version THEN 'upToDate'
+            WHEN stable.version <  unstable.version THEN 'debianOutOfDate'
+            WHEN stable.version IS NOT NULL AND unstable.version IS NULL THEN 'obsolete'
+            WHEN stable.version IS NULL AND testing.version IS NULL AND unstable.version IS NULL AND new.version IS NULL THEN 'unpackaged'
+            WHEN new.version IS NULL AND (experimental.version IS NOT NULL OR unreleased.version IS NOT NULL) THEN 'workInProgress'
+            WHEN new.version IS NOT NULL THEN 'new'
+            ELSE 'unknown' END AS debianstatus
  FROM (
   SELECT DISTINCT p.source, '' AS wnpp FROM packages p
   JOIN blends_dependencies bd ON bd.package = p.package
@@ -142,6 +156,16 @@ SELECT b.source,
     GROUP BY p.source
     ORDER BY p.source
   ) stable_bpo ON b.source = stable_bpo.source
+     LEFT OUTER JOIN (
+      SELECT DISTINCT np.source, strip_binary_upload(MAX(np.version)) AS version
+        FROM new_packages np
+        JOIN blends_dependencies b ON b.package = np.package
+        -- make sure we get the right source version that does not necessarily match binary version
+        JOIN new_sources ns ON np.source = ns.source
+        WHERE b.blend = '$1' AND b.distribution = 'new'
+        GROUP BY np.source
+        ORDER BY np.source
+     ) new ON b.source = new.source
  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
@@ -198,7 +222,7 @@ SELECT b.source,
    ) tmp
    GROUP BY source
   ) tasks ON b.source = tasks.source
-  LEFT OUTER JOIN dehs d ON b.source = d.source
+  LEFT OUTER JOIN (SELECT source, upstream_version, status FROM upstream WHERE release = 'sid') d ON b.source = d.source
   ORDER BY b.source
 ;
 

-- 
Static and dynamic websites for Debian Pure Blends