The following commit has been merged in the master branch:
commit 4d84f1d00be757454d1b5c7a5cae3a43144dd289
Author: Andreas Tille <[email protected]>
Date: Thu Nov 13 11:29:46 2014 +0100
Leave the Ubuntu release names only at one single place (it might be
possible to even detect these from the database but that's for a later point in
time)
diff --git a/webtools/templates/uthermometer.xhtml
b/webtools/templates/uthermometer.xhtml
index 5d201ce..e063e3f 100644
--- a/webtools/templates/uthermometer.xhtml
+++ b/webtools/templates/uthermometer.xhtml
@@ -67,7 +67,7 @@
<py:for each="pkg in blend_data">
<tr class='${pkg.ubuntustatus}'>
<td><strong>${pkg.source}</strong> (<span
py:choose="pkg.is_in_debian"><span py:when="1"><a
href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>, </span><span
py:otherwise=""><span py:if="pkg.wnpp != ''"><a
href="http://bugs.debian.org/${pkg.wnpp}";>WNPP</a>, </span></span></span><span
py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</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><td>${pkg.raring}</td><td>${pkg.saucy}</td><td>${pkg.trusty}</td><td
class='${pkg.upstreamstatus}'>${pkg.upstream}</td><td class='none'><py:for
each="task in pkg.tasks"><a href="../tasks/${task}">${task}</a> </py:for></td>
+
<td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.ubuntuprev2}</td><td>${pkg.ubuntuprev1}</td><td>${pkg.latestubuntu}</td><td
class='${pkg.upstreamstatus}'>${pkg.upstream}</td><td class='none'><py:for
each="task in pkg.tasks"><a href="../tasks/${task}">${task}</a> </py:for></td>
</tr>
</py:for>
</table>
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index b0564e0..770a513 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -78,9 +78,9 @@ def main():
experimental.version AS experimental,
new.version AS "NEW",
unreleased.version AS "UNRELEASED",
- %s.version AS %s,
- %s.version AS %s,
- %s.version AS %s,
+ ubuntuprev2.version AS ubuntuprev2,
+ ubuntuprev1.version AS ubuntuprev1,
+ latestubuntu.version AS latestubuntu,
d.unstable_upstream AS upstream,
CASE WHEN d.unstable_status IS NOT NULL THEN CAST(unstable_status
AS text) ELSE 'none' END AS upstreamstatus,
homepage,
@@ -95,8 +95,8 @@ def main():
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,
- CASE WHEN %s.version >= unstable.version THEN 'upToDate'
- WHEN %s.version < unstable.version THEN 'ubuntuOutOfDate'
+ CASE WHEN latestubuntu.version >= unstable.version THEN 'upToDate'
+ WHEN latestubuntu.version < unstable.version THEN
'ubuntuOutOfDate'
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 THEN 'unpackaged'
WHEN experimental.version IS NOT NULL OR unreleased.version IS
NOT NULL THEN 'workInProgress'
@@ -264,7 +264,7 @@ def main():
WHERE b.blend = $1 AND u.release = '%s'
GROUP BY u.source
ORDER BY u.source
- ) %s ON b.source = %s.source
+ ) ubuntuprev2 ON b.source = ubuntuprev2.source
LEFT OUTER JOIN (
SELECT DISTINCT u.source, strip_binary_upload(MAX(s.version)) AS version
FROM ubuntu_packages u
@@ -273,7 +273,7 @@ def main():
WHERE b.blend = $1 AND u.release = '%s'
GROUP BY u.source
ORDER BY u.source
- ) %s ON b.source = %s.source
+ ) ubuntuprev1 ON b.source = ubuntuprev1.source
LEFT OUTER JOIN (
SELECT DISTINCT u.source, strip_binary_upload(MAX(s.version)) AS version
FROM ubuntu_packages u
@@ -282,7 +282,7 @@ def main():
WHERE b.blend = $1 AND u.release = '%s'
GROUP BY u.source
ORDER BY u.source
- ) %s ON b.source = %s.source
+ ) latestubuntu ON b.source = latestubuntu.source
LEFT OUTER JOIN (
SELECT source, array_agg(task) AS tasks FROM (
SELECT DISTINCT p.source, b.task
@@ -306,10 +306,7 @@ def main():
LEFT OUTER JOIN dehs d ON b.source = d.source
ORDER BY b.source
;
- """ % ( ubuntuprev2, ubuntuprev2, ubuntuprev1, ubuntuprev1,
- latestubuntu, latestubuntu, latestubuntu, latestubuntu,
- ubuntuprev2, ubuntuprev2, ubuntuprev2, ubuntuprev1, ubuntuprev1,
ubuntuprev1,
- latestubuntu, latestubuntu, latestubuntu )
+ """ % ( ubuntuprev2, ubuntuprev1, latestubuntu )
_execute_udd_query(query)
_execute_udd_query( "EXECUTE query_thermometer('%s')" % blendname)
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
