summaryrefslogtreecommitdiff
path: root/ciabot
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-10-27 16:33:59 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-10-30 19:54:33 +0100
commit464c2df04f4799bb9ec239ee2956b124f53f6cec (patch)
tree91a5eff69428df35a6663ded6e244160ec72518b /ciabot
parent2b9a3a9c883ca6200b567b0088a9d61e6b1ed8ee (diff)
allow to pass branch=master
Diffstat (limited to 'ciabot')
-rw-r--r--ciabot/libreoffice-bugzilla2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 322ad82..39c93db 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -61,7 +61,7 @@ class FreedesktopBZ:
bug.setwhiteboard(new_whiteboard)
cgiturl = "http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s" %(repo_name, commit.hexsha)
- if branch is not None:
+ if branch is not None and branch != "master":
cgiturl = cgiturl + "&h=" + branch
else:
branch = "master"
@@ -87,7 +87,7 @@ Affected users are encouraged to test the fix and report feedback.""" %(commit.a
def find_target_version(repo, branch):
- if branch is None:
+ if branch is None or branch == "master":
return master_target
# check if committed to a release branch