From 2019f47782cb2c27023b311721c9d9e65cb823b8 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 19 Jan 2009 14:08:17 +0000 Subject: [PATCH] tweaks for branching linux-2.6 --- module-tools.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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[\w-]+):(?P[\w\.-]+)\Z") + matcher_branch_spec=re.compile("\A(?P[\w\.-]+):(?P[\w\.-]+)\Z") # special form for tagged module - for Build matcher_tag_spec=re.compile("\A(?P[\w-]+)@(?P[\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 -- 2.43.0