[Cdd-commits] r864 - cdd/trunk/webtools

[CDD Subversion Commit]

Author: tille
Date: Fri Jun 27 22:09:03 2008
New Revision: 864

Modified:
   cdd/trunk/webtools/cddtasktools.py
Log:
Make sure the real maintainer of an official package is used as responsible person instead of somebody in the tasks file.


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Fri Jun 27 22:09:03 2008
@@ -27,8 +27,8 @@
 from debian_bundle import deb822
 
 BASEURL  = 'http://ftp.debian.org/'
-# SVNHOST  = 'svn+ssh://svn.debian.org'
-SVNHOST  = 'svn://svn.debian.org'
+SVNHOST  = 'svn+ssh://svn.debian.org'
+# SVNHOST  = 'svn://svn.debian.org'
 KEYSTOIGNORE = ( 'Architecture', 'Leaf', 'NeedConfig', 'Note', 'Section', 'Needconfig')
 GLOBALCACHE  = "/var/cache/cdd/"
 DDTPURL = "http://ddtp.debian.net/debian/dists/"
@@ -469,6 +469,10 @@
                     why = stanza['why']
                     continue
                 if key == 'Responsible':
+                    if dep.responsible != None:
+                        # we are dealing with an official package that has a real maintainer who
+                        # is finally responsible
+                        continue
                     responsible = stanza['responsible'].strip()
                     if responsible != '':
                         dep.responsible = re.sub('\s*(.+)\s+<(.+ at .+)>\s*', '<a href="mailto:\\2">\\1</a>', responsible)
@@ -482,11 +486,14 @@
 
                     # turn alternatives ('|') into real depends for this purpose
                     # because we are finally interested in all alternatives
-                    dependencies = dependencies.replace('|',',').split(',')
+                    dependencies = re.sub(' *\([ \.0-9]\) *', '', dependencies)
+
+                    # Remove versions from versioned depends
+                    dependencylist = dependencies.replace('|',',').split(',')
                     # Collect all dependencies in one line first,
                     # create an object for each later
                     deps_in_one_line = []
-                    for dependency in dependencies:
+                    for dependency in dependencylist:
                         deps_in_one_line.append(dependency.strip())
 
                     for dep_in_line in deps_in_one_line:
@@ -581,6 +588,7 @@
                                 print "Unknown key '%s': %s in file %s" % (key, stanza[key], self.taskfile)
                             except:
                                 print "Unknown key '%s' with problematic value in file %s." % (key, self.taskfile)
+
             if dep != None:
                 if dep.dep_strength != 'Ignore' and dep.dep_strength != 'Avoid':
                     self.dependencies[self._FindDependencyType(dep)].append(dep)