summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-11-06 14:03:41 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-11-09 08:03:45 +0000
commit6af188d346447a92b8e41d68c7aea190521214a9 (patch)
tree7aedbb304b15ff88c86da59d9d3f763229b43855
parent72a4409de8c33f4bdccdc6770c0ac0e8a6c0e0e8 (diff)
libreoffice-bugzilla2.py: try to fix target for release branch commits
Change-Id: I4a6715d5a0312ccc1c49773b2f35f7f924bf01d6 Reviewed-on: https://gerrit.libreoffice.org/12287 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--ciabot/libreoffice-bugzilla2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 31f94268..a4f862a3 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -131,7 +131,8 @@ def find_target_version(repo, branch):
# normal beta
return base + ".0.0.beta" + str(max(beta_list) + 1)
print(micro_list)
- return base + "." + str(max(micro_list))
+ # the next release from libreoffice-x-y is max existing z-branch + 1
+ return base + "." + str(max(micro_list) + 1)
return None