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

[Markus Mohrhard]

 ciabot/libreoffice-bugzilla2.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 36abe826de9149e0cbdffb67a624e3d790bda023
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 24 21:15:24 2014 +0000

    fix handling of bugs during RC and beta phase

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index d8a01c2..448b8b2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -115,15 +115,18 @@ def find_target_version(repo, branch):
         micro_list = [m.group(1) for m in [re.search(search_string, branch) for branch in branch_names] if m is not None]
         if len(micro_list) == 0:
             # first search if we are at an RC already
-            search_string = "libreoffice-" + base + ".0." + "(\d+)"
+            search_string = "libreoffice-" + base + ".0." + "(\d+)$"
+            tags = repo.tags
+            print(tags)
             rc_list = [m.group(1) for m in [re.search(search_string, str(tag)) for tag in tags] if m is not None]
             print(rc_list)
             if len(rc_list) > 0:
-                return base + ".0." + str(max(rc_list) + 1)
+                return base + ".0." + str(int(max(rc_list)) + 1)
 
             # we have not yet tagged an RC, check which betas have been tagged
             search_string = "libreoffice-" + base + ".0.0.beta(\d+)" 
             beta_list = [m.group(1) for m in [re.search(search_string, str(tag)) for tag in tags] if m is not None]
+            print(beta_list)
             if len(beta_list) == 0:
                 # no beta yet
                 return base + ".0.0.beta0"
@@ -132,7 +135,7 @@ def find_target_version(repo, branch):
                 return base + ".0.1"
             
             # normal beta
-            return base + ".0.0.beta" + str(max(beta_list) + 1)
+            return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
         print(micro_list)
         # the next release from libreoffice-x-y is max existing z-branch + 1
         return base + "." + str(max(micro_list) + 1)
commit 6f7732d221539aead37639675f83b3c1f9791620
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 10 16:39:05 2014 +0000

    fix bug in script

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 1f764ba..d8a01c2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -113,7 +113,7 @@ def find_target_version(repo, branch):
         search_string = "libreoffice-"+"-".join(map(str, match.groups())) + "-(\d+)"
         print(search_string)
         micro_list = [m.group(1) for m in [re.search(search_string, branch) for branch in branch_names] if m is not None]
-        if micro_list.count() == 0:
+        if len(micro_list) == 0:
             # first search if we are at an RC already
             search_string = "libreoffice-" + base + ".0." + "(\d+)"
             rc_list = [m.group(1) for m in [re.search(search_string, str(tag)) for tag in tags] if m is not None]
commit 1dc1c58348129500ea9e04c66a9c101495f751de
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 10 16:38:21 2014 +0000

    use the locations on the server

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index e072f69..1f764ba 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -43,7 +43,7 @@ class FreedesktopBZ:
 
     def connect(self):
         config = ConfigParser.ConfigParser()
-        config.read('config.cfg')
+        config.read('/home/ciabot/prod/config.cfg')
         url = config.get('bugzilla', 'url')
         user = config.get('bugzilla', 'user')
         password = config.get('bugzilla', 'password')
@@ -155,7 +155,7 @@ def find_bugid(repo, commit_id):
 
 def read_repo(repo_name):
     config = ConfigParser.ConfigParser()
-    config.read('config.cfg')
+    config.read('/home/ciabot/prod/config.cfg')
     path = config.get(repo_name, 'location')
     repo = git.repo.base.Repo(path)
     return repo