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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 4dbb68ea84c1ae5d69def711d346be7289780a82
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jul 7 14:16:27 2013 +0200

    Only link to PTS if package is really in Debian and thus has a PTS page

diff --git a/misc/thermometer/templates/thermometer.xhtml b/misc/thermometer/templates/thermometer.xhtml
index 07c83fb..0d8f4fb 100644
--- a/misc/thermometer/templates/thermometer.xhtml
+++ b/misc/thermometer/templates/thermometer.xhtml
@@ -71,7 +71,7 @@ table.pkg tr.othered {
 </tr>
 <py:for each="pkg in blend_data">
  <tr class='${pkg.debianstatus}'>
-  <td><strong>${pkg.source}</strong> (<a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,<a href='${pkg.homepage}'>UP</a>)</td>
+  <td><strong>${pkg.source}</strong> (<span py:if="pkg.is_in_debian == 1"><a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,</span><a href='${pkg.homepage}'>UP</a>)</td>
   <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td>
  </tr>
 </py:for>
diff --git a/misc/thermometer/thermometer.py b/misc/thermometer/thermometer.py
index 773cf1f..6fda768 100755
--- a/misc/thermometer/thermometer.py
+++ b/misc/thermometer/thermometer.py
@@ -98,6 +98,7 @@ def main():
            d.unstable_status AS status,
            homepage,
            wnpp,
+           is_in_debian,
            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'
@@ -200,6 +201,9 @@ def main():
         GROUP BY p.source
         ORDER BY p.source
       ) stable_bpo ON b.source = stable_bpo.source
+     LEFT OUTER JOIN (
+      SELECT DISTINCT p.source, 1 AS is_in_debian FROM packages p
+     ) is_in_debian ON b.source = is_in_debian.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

-- 
Static and dynamic websites for Debian Pure Blends