[Blends-commit] [SCM] website branch, master, updated. 15ae65ffa76400ca620d9bad302909224ecdaedf
Bas Couwenberg
sebastic at xs4all.nl
Thu Oct 17 21:06:51 UTC 2013
The following commit has been merged in the master branch:
commit 15ae65ffa76400ca620d9bad302909224ecdaedf
Author: Bas Couwenberg <sebastic at xs4sall.nl>
Date: Thu Oct 17 23:01:30 2013 +0200
Also include packages in NEW in the thermometer.
diff --git a/htdocs/inc/style.css b/htdocs/inc/style.css
index cf3e22d..a97632d 100644
--- a/htdocs/inc/style.css
+++ b/htdocs/inc/style.css
@@ -1071,6 +1071,12 @@ table.pkg tr.ubuntuOutOfDate {
background-color: #f09005;
}
+/* purple */
+table.pkg tr.new {
+ color: #000000;
+ background-color: #9370db;
+}
+
/* white */
table.pkg tr.unpackaged {
color: #000000;
diff --git a/webtools/templates/thermometer.xhtml b/webtools/templates/thermometer.xhtml
index 83a1ef3..4ea76d7 100644
--- a/webtools/templates/thermometer.xhtml
+++ b/webtools/templates/thermometer.xhtml
@@ -62,12 +62,12 @@
<caption><h3>$projectname Package Thermometer</h3></caption>
<tr class='title'>
<th>Package</th>
- <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th><th>upstream</th><th>tasks</th>
+ <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>NEW</th><th>UNRELEASED</th><th>upstream</th><th>tasks</th>
</tr>
<py:for each="pkg in blend_data">
<tr class='${pkg.debianstatus}'>
<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.experimental}</td><td>${pkg.UNRELEASED}</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.experimental}</td><td>${pkg.NEW}</td><td>${pkg.UNRELEASED}</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 4069844..2173a52 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -72,6 +72,7 @@ def main():
unstable.version AS unstable,
stable_bpo.version AS "stable_bpo",
experimental.version AS experimental,
+ new.version AS "NEW",
unreleased.version AS "UNRELEASED",
precise.version AS precise,
quantal.version AS quantal,
@@ -86,8 +87,9 @@ def main():
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 THEN 'unpackaged'
- WHEN experimental.version IS NOT NULL OR unreleased.version IS NOT NULL THEN 'workInProgress'
+ 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,
CASE WHEN raring.version >= unstable.version THEN 'upToDate'
WHEN raring.version < unstable.version THEN 'ubuntuOutOfDate'
@@ -102,6 +104,10 @@ def main():
WHERE bd.blend = $1 AND
(r.sort >= (SELECT sort FROM releases WHERE role = 'stable') OR r.sort = 0) -- forget older releases than stable but allow experimental
UNION
+ SELECT DISTINCT n.source, '' AS wnpp FROM new_packages n
+ JOIN blends_dependencies bd ON bd.package = n.package
+ WHERE bd.blend = $1 AND bd.distribution = 'new'
+ UNION
SELECT DISTINCT u.source, '' AS wnpp FROM ubuntu_packages u
JOIN blends_dependencies bd ON bd.package = u.package
WHERE bd.blend = $1 AND bd.distribution = 'ubuntu'
@@ -118,6 +124,10 @@ def main():
WHERE bd.blend = $1 AND
(r.sort >= (SELECT sort FROM releases WHERE role = 'stable') OR r.sort = 0) -- forget older releases than stable but allow experimental
UNION
+ SELECT DISTINCT n.source, n.homepage, n.version FROM new_packages n
+ JOIN blends_dependencies bd ON bd.package = n.package
+ WHERE bd.blend = $1 AND bd.distribution = 'new'
+ UNION
SELECT DISTINCT u.source, u.homepage, u.version FROM ubuntu_packages u
JOIN blends_dependencies bd ON bd.package = u.package
WHERE bd.blend = $1 AND bd.distribution = 'ubuntu'
@@ -139,6 +149,11 @@ def main():
WHERE bd.blend = $1 AND
(r.sort >= (SELECT sort FROM releases WHERE role = 'stable') OR r.sort = 0) -- forget older releases than stable but allow experimental
UNION
+ SELECT DISTINCT np.source, us.vcs_browser, np.version FROM new_packages np
+ JOIN blends_dependencies bd ON bd.package = np.package
+ JOIN new_sources us ON np.source = us.source
+ WHERE bd.blend = $1 AND bd.distribution = 'new'
+ UNION
SELECT DISTINCT up.source, us.vcs_browser, up.version FROM ubuntu_packages up
JOIN blends_dependencies bd ON bd.package = up.package
JOIN ubuntu_sources us ON up.source = us.source AND up.release = us.release
@@ -210,6 +225,16 @@ def main():
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 (
+ 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
@@ -224,7 +249,7 @@ def main():
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
+ WHERE b.blend = $1 AND b.distribution != 'new'
) tmp
) unreleased ON b.source = unreleased.source
LEFT OUTER JOIN (
@@ -262,6 +287,12 @@ def main():
JOIN all_sources s ON p.source = s.source
WHERE b.blend = $1
UNION
+ SELECT DISTINCT np.source, b.task
+ FROM new_packages np
+ JOIN blends_dependencies b ON b.package = np.package
+ JOIN new_sources ns ON np.source = ns.source
+ WHERE b.blend = $1
+ UNION
SELECT DISTINCT pr.source, bd.task FROM blends_prospectivepackages pr
JOIN blends_dependencies bd ON bd.package = pr.package
WHERE bd.blend = $1 AND bd.distribution = 'prospective'
@@ -321,6 +352,7 @@ def main():
['upToDate', 'Up to date'],
['debianOutOfDate', 'Debian stable behind unstable'],
['ubuntuOutOfDate', 'Ubuntu behind Debian unstable'],
+ ['new', 'Waiting in NEW'],
['unpackaged', 'Not packaged'],
['obsolete', 'Obsolete'],
['newer-in-debian', 'Upstream behind unstable'],
--
Static and dynamic websites for Debian Pure Blends
More information about the Blends-commit
mailing list