X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=e3aaba7a240a1c1bc4dc3f968c7c5f9430efc087;hb=c634de4062cb0ba627fd799e7a8084839239fc4d;hp=7aea7acdc99146b6377bcf6065dbccdbb053eb52;hpb=828f4b4715bbbf3f8859d99fbe09592b5049d24a;p=build.git

diff --git a/module-tools.py b/module-tools.py
index 7aea7acd..e3aaba7a 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -12,7 +12,13 @@ from optparse import OptionParser
 # a map of name changes applied in git repositories.
 RENAMED_SVN_MODULES = {
     "PLEWWW": "plewww",
-    "PLCAPI": "plcapi"
+    "PLCAPI": "plcapi",
+    "BootManager": "bootmanager",
+    "BootCD": "bootcd",
+    "VserverReference": "vserver-reference",
+    "BootstrapFS": "bootstrapfs",
+    "MyPLC": "myplc",
+    "NodeManager": "nodemanager"
     }
 
 def svn_to_git_name(module):
@@ -291,6 +297,10 @@ class GitRepository:
             return self.__run_in_repo(c.run_fatal)
 
     def update(self, subdir=None, recursive=None, branch="master"):
+        if branch == "master":
+            self.__run_command_in_repo("git checkout %s" % branch)
+        else:
+            self.__run_command_in_repo("git checkout origin/%s" % branch)
         self.__run_command_in_repo("git fetch origin --tags")
         self.__run_command_in_repo("git fetch origin")
         self.__run_command_in_repo("git merge --ff origin/%s" % branch)
@@ -624,6 +634,8 @@ that for other purposes than tagging""" % options.workdir
             self.repository.update(branch=self.branch)
         elif hasattr(self,'tagname'):
             self.repository.update(branch=self.tagname)
+        else:
+            self.repository.update()
 
     def main_specname (self):
         attempt="%s/%s.spec"%(self.module_dir,self.name)