[master 2/3] Add --newrelease to makebumpver
bcl
installerbot-noreply at redhat.com
Fri Mar 6 01:26:08 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
This is written to the changelog entries and the Release: field in the
spec file. Defaults to the same release as it currently has.
---
scripts/makebumpver | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/scripts/makebumpver b/scripts/makebumpver
index 52e5be8..9e87fc6 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -66,6 +66,7 @@ class MakeBumpVer:
self.fixedin_name = kwargs.get('fixedin', self.name)
self.version = kwargs.get('version')
self.release = kwargs.get('release')
+ self.new_release = kwargs.get('new_release') or self.release
self.ignore = kwargs.get('ignore')
self.bugmap = {}
@@ -373,7 +374,7 @@ class MakeBumpVer:
""" find first occurrence of search and replace it with replace
"""
for i, l in enumerate(lines):
- if l.find(search) > -1:
+ if re.search(search, l):
break
else:
print("!!! Failed to replace '%s' with '%s'" % (search, replace))
@@ -388,6 +389,8 @@ class MakeBumpVer:
self._replaceString(l, "Version: %s\n" % (self.version),
"Version: %s\n" % (newVersion))
+ self._replaceString(l, "Release: %s\n" % (self.release+r"%{\?dist}"),
+ "Release: %s\n" % (self.new_release+r"%{?dist}"))
i = l.index('%changelog\n')
top = l[:i]
@@ -400,7 +403,7 @@ class MakeBumpVer:
today = datetime.date.today()
stamp = today.strftime("%a %b %d %Y")
f.write("* %s %s <%s> - %s-%s\n" % (stamp, self.gituser, self.gitemail,
- newVersion, self.release))
+ newVersion, self.new_release))
for msg, rhbz in rpmlog:
msg = re.sub('(?<!%)%%(?!%)|(?<!%%)%(?!%%)', '%%', msg)
@@ -436,7 +439,7 @@ class MakeBumpVer:
def run(self):
newVersion = self._incrementVersion()
- fixedIn = "%s-%s-%s" % (self.fixedin_name, newVersion, self.release)
+ fixedIn = "%s-%s-%s" % (self.fixedin_name, newVersion, self.new_release)
rpmlog = self._rpmLog(fixedIn)
self._writeNewSpec(newVersion, rpmlog)
@@ -449,6 +452,7 @@ def usage(cmd):
sys.stdout.write(" -n, --name Package name.\n")
sys.stdout.write(" -v, --version Current package version number.\n")
sys.stdout.write(" -r, --release Package release number.\n")
+ sys.stdout.write(" --newrelease Value for release in the .spec file.\n")
sys.stdout.write(" -i, --ignore Comma separated list of git commits to ignore.\n")
sys.stdout.write(" -m, --map Comma separated list of FEDORA_BZ=RHEL_BZ mappings.\n")
sys.stdout.write(" -s, --skip-acks Skip checking for rhel-X.X.X ack flag\n")
@@ -463,14 +467,14 @@ def main(argv):
prog = os.path.basename(argv[0])
cwd = os.getcwd()
spec = os.path.realpath(cwd + '/python-blivet.spec')
- name, version, release = None, None, None
+ name, version, release, new_release = None, None, None, None
ignore, bugmap = None, None
show_help, unknown, skip_acks = False, False, False
opts = []
try:
opts, _args = getopt.getopt(argv[1:], 'n:v:r:i:m:d?',
- ['name=', 'version=', 'release=',
+ ['name=', 'version=', 'release=', 'newrelease=',
'ignore=', 'map=', 'debug', 'help'])
except getopt.GetoptError:
show_help = True
@@ -482,6 +486,8 @@ def main(argv):
version = a
elif o in ('-r', '--release'):
release = a
+ elif o in ('--newrelease'):
+ new_release = a
elif o in ('-i', '--ignore'):
ignore = a
elif o in ('-m', '--map'):
@@ -528,7 +534,8 @@ def main(argv):
mbv = MakeBumpVer(name=name, version=version, release=release,
ignore=ignore, bugmap=bugmap, spec=spec, skip_acks=skip_acks,
- version_files=version_files, fixedin="python-"+name)
+ version_files=version_files, fixedin="python-"+name,
+ new_release=new_release)
mbv.run()
if __name__ == "__main__":
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/297c4336c2079ded0e5b3feedc0034d7e9959423
More information about the anaconda-patches
mailing list