From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 13 Jun 2008 07:22:15 +0000 (+0000)
Subject: module-tag has new option -b to deal with a given build branch
X-Git-Tag: 4.2-rc21~44
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=019de7833a6d83c2e5cf60fda92e948388a2fe7b;p=build.git

module-tag has new option -b to deal with a given build branch
---

diff --git a/module-tools.py b/module-tools.py
index ef422d42..594f81ca 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -698,6 +698,8 @@ Please write a changelog for this new tag in the section above
             buildname=Module.config['build']
         except:
             buildname="build"
+        if self.options.build_branch:
+            buildname+=":"+self.options.build_branch
         build = Module(buildname,self.options)
         build.init_moddir()
         build.init_edge_dir()
@@ -902,6 +904,8 @@ More help:
         if mode == "tag" :
             parser.add_option("-c","--no-changelog", action="store_false", dest="changelog", default=True,
                               help="do not update changelog section in specfile when tagging")
+            parser.add_option("-b","--build-branch", action="store", dest="build_branch", default=None,
+                              help="specify a build branch; used for locating the *tags*.mk files where adoption is to take place")
         if mode == "tag" or mode == "sync" :
             parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(),
                               help="specify editor")