From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 19 Jan 2009 14:08:17 +0000 (+0000)
Subject: tweaks for branching linux-2.6
X-Git-Tag: 4.3-rc1~104
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2019f47782cb2c27023b311721c9d9e65cb823b8;p=build.git

tweaks for branching linux-2.6
---

diff --git a/module-tools.py b/module-tools.py
index 63637905..36283668 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -169,7 +169,7 @@ class Module:
 
 
     # for parsing module spec name:branch
-    matcher_branch_spec=re.compile("\A(?P<name>[\w-]+):(?P<branch>[\w\.-]+)\Z")
+    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
@@ -801,9 +801,11 @@ n: move to next file"""%locals()
         # do this before anything else and restore .branch to None, 
         # as this is part of the class's logic
         new_trunk_name=None
-        if self.branch:
+        if hasattr(self,'branch'):
             new_trunk_name=self.branch
-            self.branch=None
+            del self.branch
+        elif self.options.new_version:
+            new_trunk_name = self.options.new_version
 
         # compute diff - a way to initialize the whole stuff
         # do_diff already does edge_dir initialization