git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserverreference renamed to vserver-reference
[build.git]
/
module-tools.py
diff --git
a/module-tools.py
b/module-tools.py
index
7aea7ac
..
e3aaba7
100755
(executable)
--- 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",
# 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):
}
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"):
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)
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)
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)
def main_specname (self):
attempt="%s/%s.spec"%(self.module_dir,self.name)