From cafa5cab5459ff95733c3fa1ec7fe8ca1b241b3a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 23 Aug 2011 20:01:42 +0200 Subject: [PATCH] consider only *-tags.mk and not *-tags*.mk when adopting tags (again!) --- module-tools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module-tools.py b/module-tools.py index 5bbf74b3..3663f3ec 100755 --- a/module-tools.py +++ b/module-tools.py @@ -993,7 +993,7 @@ Please write a changelog for this new tag in the section above if not build.is_clean(): build.revert() - tagsfiles=glob(build.path+"/*-tags*.mk") + tagsfiles=glob(build.path+"/*-tags.mk") tagsdict=dict( [ (x,'todo') for x in tagsfiles ] ) default_answer = 'y' tagsfiles.sort() @@ -1386,7 +1386,7 @@ Branches: 'version' : "check latest specfile and print out details", 'diff' : "show difference between module (trunk or branch) and latest tag", 'tag' : """increment taglevel in specfile, insert changelog in specfile, - create new tag and and monitor its adoption in build/*-tags*.mk""", + create new tag and and monitor its adoption in build/*-tags.mk""", 'branch' : """create a branch for this module, from the latest tag on the trunk, and change trunk's version number to reflect the new branch name; you can specify the new branch name by using module:branch""", @@ -1459,7 +1459,7 @@ Branches: 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") + 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") -- 2.43.0