* fix machers (for branch, tag, spec file) to be able to use '-' and even '/' (for...

[build.git] / module-tools.py

diff --git a/module-tools.py b/module-tools.py
index bb41c38..5bbf74b 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -24,18 +24,6 @@ RENAMED_SVN_MODULES = {
     "NodeUpdate": "nodeupdate",
     "Monitor": "monitor",
 
-    #we keep planetlab modules in a sub-directory
-    "planetlab/PLEWWW": "planetlab/plewww",
-    "planetlab/PLCAPI": "planetlab/plcapi",
-    "planetlab/BootManager": "planetlab/bootmanager",
-    "planetlab/BootCD": "planetlab/bootcd",
-    "planetlab/VserverReference": "planetlab/vserver-reference",
-    "planetlab/BootstrapFS": "planetlab/bootstrapfs",
-    "planetlab/MyPLC": "planetlab/myplc",
-    "planetlab/CoDemux": "planetlab/codemux",
-    "planetlab/NodeManager": "planetlab/nodemanager",
-    "planetlab/NodeUpdate": "planetlab/nodeupdate"
-
     }
 
 def svn_to_git_name(module):
@@ -457,10 +445,10 @@ class Module:
             while not cls.config[key]:
                 cls.prompt_config_option(key, message, default)
 
-    # for parsing module spec name:branch
-    matcher_branch_spec=re.compile("\A(?P<name>[\w\.-\/]+):(?P<branch>[\w\.-]+)\Z")
-    # special form for tagged module - for Build
-    matcher_tag_spec=re.compile("\A(?P<name>[\w\.-\/]+)@(?P<tagname>[\w\.-]+)\Z")
+    # for parsing module spec name:branch                                                                                                                                                                     
+    matcher_branch_spec=re.compile("\A(?P<name>[\w\.\-\/]+):(?P<branch>[\w\.\-]+)\Z")                                                                                                                         
+    # special form for tagged module - for Build                                                                                                                                                              
+    matcher_tag_spec=re.compile("\A(?P<name>[\w\.\-\/]+)@(?P<tagname>[\w\.\-]+)\Z")
     # parsing specfiles
     matcher_rpm_define=re.compile("%(define|global)\s+(\S+)\s+(\S*)\s*")
 
@@ -1005,7 +993,7 @@ Please write a changelog for this new tag in the section above
         if not build.is_clean():
             build.revert()
 
-        tagsfiles=glob(build.path+"/*-tags.mk")
+        tagsfiles=glob(build.path+"/*-tags*.mk")
         tagsdict=dict( [ (x,'todo') for x in tagsfiles ] )
         default_answer = 'y'
         tagsfiles.sort()
@@ -1398,7 +1386,7 @@ Branches:
         'version' : "check latest specfile and print out details",
         'diff' : "show difference between module (trunk or branch) and latest tag",
         'tag'  : """increment taglevel in specfile, insert changelog in specfile,
-                create new tag and and monitor its adoption in build/*-tags.mk""",
+                create new tag and and monitor its adoption in build/*-tags*.mk""",
         'branch' : """create a branch for this module, from the latest tag on the trunk, 
                   and change trunk's version number to reflect the new branch name;
                   you can specify the new branch name by using module:branch""",