[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

Michael Stahl mstahl at redhat.com
Sun Nov 9 00:59:04 PST 2014


 ciabot/libreoffice-bugzilla2.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6af188d346447a92b8e41d68c7aea190521214a9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 6 14:03:41 2014 +0100

    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 at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 31f9426..a4f862a 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
 


More information about the Libreoffice-commits mailing list