summaryrefslogtreecommitdiffstats
path: root/scripts/makebumpver
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2010-06-22 10:32:53 -1000
committerDavid Cantrell <dcantrell@redhat.com>2010-06-24 06:59:20 -1000
commit3d5379fac133e89cc8ad58d32ef3d8a0233aa421 (patch)
treedb5ad283cd3f7776297413c03f5b88541a2781a2 /scripts/makebumpver
parent3bd21df61d98f0b0194ffc9dd88f3d756f87f073 (diff)
downloadanaconda-3d5379fac133e89cc8ad58d32ef3d8a0233aa421.tar.gz
anaconda-3d5379fac133e89cc8ad58d32ef3d8a0233aa421.tar.xz
anaconda-3d5379fac133e89cc8ad58d32ef3d8a0233aa421.zip
Handle "(#BUGNUM, author)" in git log summary lines.
Diffstat (limited to 'scripts/makebumpver')
-rwxr-xr-xscripts/makebumpver24
1 files changed, 22 insertions, 2 deletions
diff --git a/scripts/makebumpver b/scripts/makebumpver
index 62fed9aa2..91ed5c9e2 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -220,10 +220,30 @@ class MakeBumpVer:
rhbz = set()
# look for a bug in the summary line, validate if found
- m = re.search("\(#\d+\)", summary)
+ m = re.search("\(#\d+(\,.*)*\)", summary)
if m:
fullbug = summary[m.start():m.end()]
- bug = summary[m.start()+2:m.end()-1]
+ bugstr = summary[m.start()+2:m.end()-1]
+
+ bug = ''
+ for c in bugstr:
+ if c.isdigit():
+ bug += c
+ else:
+ break
+
+ if len(bugstr) > len(bug):
+ tmp = bugstr[len(bug):]
+
+ for c in tmp:
+ if not c.isalpha():
+ tmp = tmp[1:]
+ else:
+ break
+
+ if len(tmp) > 0:
+ author = tmp
+
ckbug = self.bugmap.get(bug, bug)
valid = self._isRHELBug(ckbug, commit, summary)