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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 56b9842c7cc9b60fe334aff02512813d0f0c66e1
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Mar 20 14:31:36 2016 +0100

    Remove vcs_found completely: not used anymore

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index ba9a352..bb6f38e 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -729,7 +729,6 @@ class DependantPackage:
                                           # because Enhances relations are quite seldom
         self.properties['stable_testing_version'] = []  # (release, version) tuples where release is codename for stable and testing
         self.properties['version'] = []  # list of {'release', 'version', 'archs'} dictionary containing version and architecture information
-        self.vcs_found      = False # we need a flag to store the fact whether Vcs information of a package is in UDD
         self.desc           = {}    # Prospective packages should have a description ...
                                     # ... which could be copied to (or from if exists)
                                     # WNPP bug and finally can be used for packaging
@@ -1231,9 +1230,6 @@ class TaskDependencies:
                                      % stanza['homepage'])
                 elif key.lower() in ('vcs-svn', 'vcs-git'):
                     if dep is not None:
-                        if dep.vcs_found:
-                            fields_obsolete.append(key)
-                            continue
                         vcs = dep.properties.setdefault('vcs', {})
                         vcs['url']  = stanza[key.lower()]
                         vcs['type'] = key.split('-')[1].capitalize()
@@ -1249,9 +1245,6 @@ class TaskDependencies:
                         dep.properties['pkgstatus'] = 'pkgvcs'
                 elif key.lower() == 'vcs-browser':
                     if dep is not None:
-                        if dep.vcs_found:
-                            fields_obsolete.append(key)
-                            continue
                         vcs = dep.properties.setdefault('vcs', {})
                         vcs['browser'] = stanza['vcs-browser']
                         if re.compile("[/.]git\.").search(vcs['browser']):
@@ -1279,9 +1272,6 @@ class TaskDependencies:
                                      % (key, stanza[key.lower()]))
                 elif key == 'License':
                     if dep is not None:
-                        if dep.vcs_found and key.lower() in dep.properties:
-                            fields_obsolete.append(key)
-                            continue
                         dep.properties[key.lower()]  = stanza[key.lower()]
                     else:
                         logger.error("Dep not initiated before %s %s -> something is wrong."
@@ -1309,9 +1299,6 @@ class TaskDependencies:
                                      % (key, stanza[key.lower()]))
                 elif key == 'WNPP':
                     if dep is not None:
-                        if dep.vcs_found and key.lower() in dep.properties:
-                            fields_obsolete.append(key)
-                            continue
                         wnpp = stanza['wnpp'].strip()
                         # in case somebody prepended a '#' sign before the bug number
                         wnpp = re.sub('^#', '', wnpp)
@@ -1762,7 +1749,6 @@ class TaskDependencies:
                 # There is only one line returned by this query
                 row = RowDictionaries(curs)[0]
                 # If some information about Vcs is found in the database make sure it is ignored from tasks file
-                self.vcs_found = True
                 for prop in row.keys():
                     if row[prop]:
                         self.properties[prop] = row[prop]
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 0ce6682..1edd5ea 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -686,7 +686,6 @@ class DependantPackage:
                                           # because Enhances relations are quite seldom
         self.properties['stable_testing_version'] = []  # (release, version) tuples where release is codename for stable and testing
         self.properties['version'] = []  # list of {'release', 'version', 'archs'} dictionary containing version and architecture information
-        self.vcs_found      = False # we need a flag to store the fact whether Vcs information of a package is in UDD
         self.debtags        = {}    # list of {'tag', 'value'} dictionary containing debtag information
         self.screenshots    = []    # list of {'version', 'url'} dictionary containing screenshot information
         self.icon           = None  # URL of small screenshot icon

-- 
Static and dynamic websites for Debian Pure Blends