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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 801266a98bfd0b24e23d36267ad3329969e455a2
Author: Ole Streicher <ole at aip.de>
Date:   Thu Mar 17 14:33:54 2016 +0100

    Replace list in GetUpdatablePackages() by a dictionary

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 763dba4..9f75d4a 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -985,18 +985,20 @@ class Tasks:
 
         for task in self.metapackagekeys:
             tdeps = self.tasks[task]
-            list = []
+            pkgList = []
             for dep in use_dependencystatus:
                 for tdep in tdeps.dependencies[dep]:
                     if tdep.outdated != {}:
-                        if 'last_uploader_simple' in tdep.properties:
-                            last_uploader = tdep.properties['last_uploader_simple']
-                        else:
-                            last_uploader = None
                         # versions are ordered lists      ---v--- last one is needed
-                        list.append(((tdep.pkg, tdep.version[-1]['version'], tdep.outdated['version'], tdep.properties['maintainer']), last_uploader))
-            if list:
-                ret[task] = list
+                        pkgList.append({
+                            'name': tdep.pkg,
+                            'debian_version': tdep.version[-1]['version'],
+                            'upstream_version': tdep.outdated['version'],
+                            'maintainer': tdep.properties['maintainer'],
+                            'uploader': tdep.properties.get('last_uploader_simple')
+                        })
+            if pkgList:
+                ret[task] = pkgList
         return ret
 
     def GetAllDependentPackagesOfBlend(self, dependencystatus=[]):
diff --git a/webtools/new_upstream.py b/webtools/new_upstream.py
index 4b89b9a..b56e3b2 100755
--- a/webtools/new_upstream.py
+++ b/webtools/new_upstream.py
@@ -20,12 +20,15 @@ tasks.GetAllDependencies(source=1)
 packages = tasks.GetUpdatablePackages(dependencystatus=['official_high', 'official_low', 'non-free', 'experimental'])
 
 for task in packages.keys():
-    print("Updatable packages in Task %s" % task)
+    print("Updatable packages in Task {0}".format(task))
     for pkg_v_o in packages[task]:
-        printstring = "\t%s:\n\t\tHighest version in Debian is %s\n\t\tUpstream has %s\n\t\tMaintainer is %s" % (pkg_v_o[0])
-        if pkg_v_o[1]:
-            printstring = printstring + "\n\t\tLast uploader was " + pkg_v_o[1]
-        print(printstring)
+        printstring = '\t{name}:\n'
+        printstring += '\t\tHighest version in Debian is {debian_version}\n'
+        printstring += '\t\tUpstream has {upstream_version}\n'
+        printstring += '\t\tMaintainer is {maintainer}'
+        if 'uloader' in pkg_v_o:
+            printstring += '\n\t\tLast uploader was {uploader}'
+        print(printstring.format(**pkg_v_o))
 
 # Perhaps we should also send a mail to pts at qa.debian.org
 #     keyword %(pkg) %(list) = bts bts-control upload-source katie-other summary default cvs ddtp derivatives contact

-- 
Static and dynamic websites for Debian Pure Blends