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

[Ole Streicher]

The following commit has been merged in the master branch:
commit dfc07f392e21ae03ffb4409694713f5bb765038e
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Mar 7 22:03:34 2016 +0100

    Display WNPP status also for packages that are already in VCS

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 4cd833b..ae607d9 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1792,7 +1792,7 @@ class TaskDependencies:
         # Verify whether packages which are neither in pool, new, vcs nor virtual have sufficient information in task file
         for status in self.dependencies.keys():
             for dep in self.dependencies[status]:
-                if dep.pkg not in pkgs_in_pool and dep.pkg not in pkgs_in_new and dep.pkg not in pkgs_virtual and (dep.pkgstatus == 'unknown' or dep.pkgstatus == 'pkgvcs'):
+                if dep.pkg not in pkgs_in_pool and dep.pkg not in pkgs_in_new and dep.pkg not in pkgs_virtual and dep.pkgstatus in ('unknown', 'pkgvcs'):
                     # If only Vcs fields are given than we currently do not know enough to print package information
                     if dep.pkgstatus == 'pkgvcs' and (dep.properties['homepage'] == HOMEPAGENONE or dep.desc['en'] == {}):
                         logger.error("Package %s in task %s has only Vcs information - please provide more information" % (dep.pkg, dep.taskname))
@@ -1808,7 +1808,7 @@ class TaskDependencies:
                             logger.error("Package %s neither in pool nor new and has no description - ignored" % dep.pkg)
                 else:
                     # prevent printing WNPP of packages inside Debian
-                    if 'wnpp' in dep.properties and dep.pkgstatus != 'wnpp':
+                    if 'wnpp' in dep.properties and dep.pkgstatus not in ('wnpp', 'pkgvcs'):
                         del dep.properties['wnpp']
 
         for dependency in self.dependencies.keys():

-- 
Static and dynamic websites for Debian Pure Blends