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

[CDD Subversion Commit]

Author: tille
Date: Sun Jun 29 17:52:00 2008
New Revision: 869

Modified:
   cdd/trunk/webtools/cddtasktools.py
   cdd/trunk/webtools/tasks.py
Log:
Fixed the versioned dependency removal code


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Sun Jun 29 17:52:00 2008
@@ -484,11 +484,11 @@
                     #       on this.  So remove this stuff here for the Moment
                     dependencies = re.sub('\\\\\n\s+', '', stanza[key])
 
+                    # Remove versions from versioned depends
+                    dependencies = re.sub(' *\([ ><=\.0-9]+\) *', '', dependencies)
+
                     # turn alternatives ('|') into real depends for this purpose
                     # because we are finally interested in all alternatives
-                    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

Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Sun Jun 29 17:52:00 2008
@@ -17,7 +17,7 @@
 
 from cddtasktools import CddDependencies, ReadConfig
 
-languages = ('en', 'da', 'de', 'es', 'fr', 'it', 'jp', 'pt')
+languages = ('en', 'da', 'de', 'es', 'fr', 'it', 'ja', 'pt')
 
 if len(argv) <= 1:
 	print >>stderr, "Usage: %s <CDD name>\n       The <CDD name> needs a matching config file webconf/<CDD name>.conf"\