[Blends-commit] [SCM] website branch, master, updated. 299be9844a834b38dea93f0f5ef6821e035b3bc6
Andreas Tille
tille at debian.org
Mon Jul 15 10:07:32 UTC 2013
The following commit has been merged in the master branch:
commit 40af5fa6d014691bf5201936876a86895ee2f39b
Author: Andreas Tille <tille at debian.org>
Date: Mon Jul 15 11:40:09 2013 +0200
Query tasks a package might be added to from UDD
diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index 49908ce..4fc7690 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -31,7 +31,8 @@ SELECT b.source,
d.unstable_upstream AS upstream,
d.unstable_status AS status,
homepage,
- wnpp
+ wnpp,
+ tasks.tasks
FROM (
SELECT DISTINCT p.source, '' AS wnpp FROM packages p
JOIN blends_dependencies bd ON bd.package = p.package
@@ -166,6 +167,18 @@ SELECT b.source,
GROUP BY u.source
ORDER BY u.source
) raring ON b.source = raring.source
+ LEFT OUTER JOIN (
+ SELECT source, array_agg(task) AS tasks FROM (
+ SELECT DISTINCT p.source, b.task
+ FROM packages p
+ JOIN releases r ON p.release = r.release
+ JOIN blends_dependencies b ON b.package = p.package
+ -- make sure we get the right source version that does not necessarily match binary version
+ JOIN sources s ON p.source = s.source AND p.release = s.release
+ WHERE b.blend = '$1'
+ ) tmp
+ GROUP BY source
+ ) tasks ON b.source = tasks.source
LEFT OUTER JOIN dehs d ON b.source = d.source
ORDER BY b.source
;
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index f99afd5..52a306b 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -82,6 +82,7 @@ def main():
wnpp,
is_in_debian,
vcs_browser,
+ 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'
@@ -253,6 +254,17 @@ def main():
GROUP BY u.source
ORDER BY u.source
) raring ON b.source = raring.source
+ LEFT OUTER JOIN (
+ SELECT source, array_agg(task) AS tasks FROM (
+ SELECT DISTINCT p.source, b.task
+ FROM packages p
+ JOIN releases r ON p.release = r.release
+ JOIN blends_dependencies b ON b.package = p.package
+ JOIN sources s ON p.source = s.source AND p.release = s.release
+ WHERE b.blend = '$1'
+ ) tmp
+ GROUP BY source
+ ) tasks ON b.source = tasks.source
LEFT OUTER JOIN dehs d ON b.source = d.source
ORDER BY b.source
;
--
Static and dynamic websites for Debian Pure Blends
More information about the Blends-commit
mailing list