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

2020-07-01 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4101d4e9d8cbb5c0df8ee3232bd1e3af06897573
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 05:05:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 05:07:52 2020 +0200

ciabot: Fix str vs. int comparison.

Traceback (most recent call last):
  […]
  File "/srv/ciabot/prod/libreoffice-bugzilla2.py", line 142, in 
find_target_version
if max(beta_list) >= 2:
TypeError: '>=' not supported between instances of 'str' and 'int'

Regression from f2204d126c2334ccbe061cd27d519316426448c1.  Solved by
turning to int early for bug numbers and maj/min/etc version numbers.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8ba84e2..3f61597 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -105,7 +105,7 @@ def find_target_version(repo, branch):
 # form libreoffice-x-y-z => will be available in x.y.z
 match = re.search("libreoffice-(\d+)-(\d+)-(\d+)", branch)
 if match is not None:
-return ".".join(map(str, match.groups()))
+return ".".join(match.groups())
 
 # form libreoffice-x-y
 # branch of libreoffice-x-y-z exists => will be available in x.y.z+1
@@ -115,26 +115,26 @@ def find_target_version(repo, branch):
 #   beta
 match = re.search("libreoffice-(\d+)-(\d+)", branch)
 if match is not None:
-base = ".".join(map(str, match.groups()))
+base = ".".join(match.groups())
 branches = repo.remote().refs
 branch_names = [str(branch) for branch in branches]
 print(branch_names)
-search_string = "libreoffice-"+"-".join(map(str, match.groups())) + 
"-(\d+)"
+search_string = "libreoffice-" + "-".join(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]
+micro_list = [int(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+)$"
 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]
+rc_list = [int(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(int(max(rc_list)) + 1)
+return base + ".0." + str(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]
+beta_list = [int(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
@@ -145,10 +145,10 @@ def find_target_version(repo, branch):
 return base + ".0.1"
 
 # normal beta
-return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
+return base + ".0.0.beta" + str(max(beta_list) + 1)
 print(micro_list)
 # the next release from libreoffice-x-y is max existing z-branch + 1
-return base + "." + str(int(max(micro_list)) + 1)
+return base + "." + str(max(micro_list) + 1)
 
 return None
 
@@ -165,7 +165,7 @@ def find_bugid(repo, commit_id):
 print("no bugid found")
 sys.exit()
 
-return m
+return [int(i) for i in m]
 
 def read_repo(repo_name):
 config = configparser.ConfigParser()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-07-01 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py |   19 +--
 1 file changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 7a647c3da1a93cc38fe922706f25124c384a4a48
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:13:10 2020 +0200

ciabot: Port libreoffice-bugzilla2.py to python3.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
 # - adds a comment to the report
 # - updates the whiteboard field with target information
 
-from __future__ import print_function
-
 import datetime
 import os
 import re
 import sys, getopt
 import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
 
 import bugzilla
-from bugzilla import Bugzilla
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
 bz = None
 
 def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
 if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version))
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" % 
comment_msg))
 else:
 bug.addcomment(comment_msg)
 
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
 return m
 
 def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-06-30 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4b667b2ccae3f3237cfdea90cf30138a7c930128
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 14:32:52 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 14:32:52 2020 +0200

ciabot: More fixes for the python-bugzilla API breakage.

See 
https://blog.wikichoon.com/2016/06/python-bugzilla-api-changes-in-git.html .

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index fc53f62..8d11e31 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -65,14 +65,15 @@ class FreedesktopBZ:
 if not bug.product in ("LibreOffice", "LibreOffice Online"):
 print("refusing to update bug with non-LO component")
 return;
-old_whiteboard = bug.getwhiteboard()
+old_whiteboard = bug.whiteboard
 
 m = re.findall(new_version, old_whiteboard)
 if m is None or len(m) == 0:
 if not old_whiteboard == "":
 old_whiteboard = old_whiteboard + " "
 new_whiteboard = old_whiteboard + "target:" + new_version
-bug.setwhiteboard(new_whiteboard)
+update = self.bz.build_update(whiteboard=new_whiteboard)
+self.bz.update_bugs([bugnr], update)
 
 cgiturl = "https://git.libreoffice.org/%s/commit/%s"; % (repo_name, 
commit.hexsha)
 if branch is None:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-06-29 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9130496f208666fdad8eef500801ec0cf79b65f0
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 04:19:04 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 04:19:04 2020 +0200

ciabot: Remove import of unused private method.

`_BugzillaToken` was renamed to `_BugzillaTokenCache` in 2.1.0, but the
method is private and we don't use it.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 019b7be..fc53f62 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -35,7 +35,6 @@ else:
 
 import bugzilla
 from bugzilla import Bugzilla
-from bugzilla.base import _BugzillaToken
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-06-29 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3fbe972c3b34042a215b816cc9d82c357718c53
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 04:09:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 04:09:31 2020 +0200

ciabot: bump master target

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 0e58419..019b7be 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -37,7 +37,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "7.0.0"
+master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-21 Thread Guilhem Moulin (via logerrit)
 ciabot/libreoffice-bugzilla2.py  |8 
 ciabot/run-libreoffice-ciabot.pl |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 305096a5d87fcb6db3cc497b9020d69a1c5a7bcd
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 03:32:25 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 03:33:24 2020 +0100

ciabot: fix minor space damage

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 1916097..5717e9a 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -1,16 +1,16 @@
 # libreoffice git bugzilla integration
 # Copyright (C) 2014 Markus Mohrhard
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see .
 #
@@ -152,7 +152,7 @@ def find_target_version(repo, branch):
 # we only release two betas (except when we release three),
 # therefore now the next will be a RC
 return base + ".0.1"
-
+
 # normal beta
 return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
 print(micro_list)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 5ff97ec..668c6b7 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -120,9 +120,9 @@ sub report($$$) {
 qx(perl -I $cwd $cwd/sigui-bugzilla.pl 
$repo $_ $branch_name);
 } else {
 if ( is_valid_bugzilla_commit( $repo, 
$branch_name ) ) {
-   my $branch = $branch_name;
-   $branch = 'master' if ($branch eq '');
-   print "reporting to bugzilla: $_ and 
branch $branch";
+my $branch = $branch_name;
+$branch = 'master' if ($branch eq '');
+print "reporting to bugzilla: $_ and 
branch $branch";
 qx(python 
$cwd/libreoffice-bugzilla2.py -r $repo -c $_ -b $branch >> 
/srv/home/ciabot/bugzilla.log);
 }
 qx($ciabot $repo $_ $branch_name 
$ciaproxy);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2019-03-07 Thread Libreoffice Gerrit user
 ciabot/libreoffice-bugzilla2.py |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit d979d3d34f5b3007f34f3fc664377af4921a1bb2
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Fri Mar 8 13:19:51 2019 +0530
Commit: Samuel Mehrbrodt 
CommitDate: Fri Mar 8 08:57:11 2019 +0100

Code optimization in dev-tools/ciabot

Previously the get_commit() func was called twice, now with one call,
the program works as it is.

Change-Id: I3f4ec4d2d94d9c86b1dc8879539a7dbfb3895327
Reviewed-on: https://gerrit.libreoffice.org/67897
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index f08e42b..626a7d6 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -167,15 +167,14 @@ def get_commit(repo, commit_id):
 commit = repo.commit(commit_id)
 return commit
 
-def find_bugid(repo, commit_id):
-commit = get_commit(repo, commit_id)
+def find_bugid(commit):
 summary_line = commit.summary
 regex = re.compile(bug_regex)
 m = regex.findall(summary_line)
 if m is None or len(m) == 0:
 print("no bugid found")
 sys.exit()
-
+
 return m
 
 def read_repo(repo_name):
@@ -220,10 +219,10 @@ def main(argv):
 
 target_version = find_target_version(repo, branch)
 
-bug_ids = find_bugid(repo, commit_id)
-
 commit = get_commit(repo, commit_id)
 
+bug_ids = find_bugid(commit)
+
 if target_version is None:
 print("missing target version")
 print(opts)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-18 Thread Libreoffice Gerrit user
 ciabot/libreoffice-bugzilla2.py |4 
 1 file changed, 4 insertions(+)

New commits:
commit b122dcd8db04783314cb150fd2706edb31a1
Author: 22shubh22 <22shub...@gmail.com>
AuthorDate: Sat Feb 16 19:53:07 2019 +0530
Commit: Thorsten Behrens 
CommitDate: Mon Feb 18 09:39:12 2019 +0100

Documentation: - Working of script

Change-Id: I2486c59fb956b7bc706fc859b1b6be7baa0bffdb
Reviewed-on: https://gerrit.libreoffice.org/67905
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 3913d7d..f08e42b 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -13,6 +13,10 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see .
+#
+# When a commit referencing a report is merged, this script
+# - adds a comment to the report
+# - updates the whiteboard field with target information
 
 from __future__ import print_function
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-27 Thread Christian Lohmaier
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47c6f434028c9b6a86f0f0cdb2a39aa05fad323c
Author: Christian Lohmaier 
Date:   Mon Nov 27 17:48:39 2017 +0100

master is now on its way to 6.1.0...

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 2b59186..3913d7d 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "6.0.0"
+master_target = "6.1.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-09 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b9ac850acb8853538d45d84136f1dde325a7680
Author: Markus Mohrhard 
Date:   Sat Jun 10 02:06:19 2017 +0200

master will become 6.0

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 402d36c..2b59186 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.5.0"
+master_target = "6.0.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-18 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80319fe1173f43bc75a6c0c1a7d063ceb7a4ab59
Author: Markus Mohrhard 
Date:   Thu May 18 16:46:14 2017 +0200

update master target for git bugzilla integration

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 0dbb925..402d36c 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.4.0"
+master_target = "5.5.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2016-11-24 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b55de337ecd0900af437fafe470c1faf99c59b07
Author: Markus Mohrhard 
Date:   Thu Nov 24 12:49:29 2016 +0100

update master target for bugzilla

Change-Id: Idea221624e5b5b245ca76b8e5485f7f65a023425

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 3163782..0dbb925 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.3.0"
+master_target = "5.4.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2016-05-26 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2decdd85a9b14aed0aecb63187949a9703eefe10
Author: Miklos Vajna 
Date:   Thu May 26 09:45:35 2016 +0200

ciabot: set master_target to 5.3.0

Change-Id: I73fa02ffb1da5c5def8ecd273feca8bf02f1a4ce

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 2acdf55..3163782 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.2.0"
+master_target = "5.3.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2016-02-14 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6f1d55ec8055f23613603fad5e82a5ec4f40890c
Author: Markus Mohrhard 
Date:   Mon Feb 15 04:05:18 2016 +0100

leave out leading whitespace for empty whiteboard

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 075fe47..2acdf55 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -66,7 +66,9 @@ class FreedesktopBZ:
 
 m = re.findall(new_version, old_whiteboard)
 if m is None or len(m) == 0:
-new_whiteboard = old_whiteboard + " target:" + new_version
+if not old_whiteboard == "":
+old_whiteboard = old_whiteboard + " "
+new_whiteboard = old_whiteboard + "target:" + new_version
 bug.setwhiteboard(new_whiteboard)
 
 cgiturl = "http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s"; 
%(repo_name, commit.hexsha)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-11-26 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 120f31ed6973f82021487516d53fe792d5eddbdd
Author: Miklos Vajna 
Date:   Thu Nov 26 20:25:27 2015 +0100

ciabot: master is now 5.2

Change-Id: Ie2e4ae04b488ba9afd9138181e40e140f8ec4212

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index eb7340e..075fe47 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.1.0"
+master_target = "5.2.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-10-09 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 481ff90d010361abf7ac7170bfc77680199e1394
Author: Miklos Vajna 
Date:   Fri Oct 9 15:24:10 2015 +0200

ciabot: allow online.git bugzilla notification

Change-Id: Id3f053579bad357282e9c716dc660b29e91aa1c0

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 507799f..eb7340e 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -59,7 +59,7 @@ class FreedesktopBZ:
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
-if bug.product != "LibreOffice":
+if not bug.product in ("LibreOffice", "LibreOffice Online"):
 print("refusing to update bug with non-LO component")
 return;
 old_whiteboard = bug.getwhiteboard()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-10-07 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |   34 +++---
 1 file changed, 19 insertions(+), 15 deletions(-)

New commits:
commit bff14d2a3643d1d190486cefa174cefbfd8b6919
Author: Miklos Vajna 
Date:   Wed Oct 7 15:00:32 2015 +0200

libreoffice-bugzilla2: fix --dry-run

Change-Id: I87b6caff6ea36cc469fb669469f5055bbab8da44

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 310fe20..507799f 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -49,23 +49,24 @@ class FreedesktopBZ:
 user = config.get('bugzilla', 'user')
 password = config.get('bugzilla', 'password')
 self.bz = self.bzclass(url=url, cookiefile = "/tmp/cookie", tokenfile 
= "/tmp/token")
-self.bz.login(user=user, password=password)
+if not dry_run:
+self.bz.login(user=user, password=password)
 
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
-bug = self.bz.getbug(bugnr)
-print(bug)
-if bug.product != "LibreOffice":
-print("refusing to update bug with non-LO component")
-return;
-old_whiteboard = bug.getwhiteboard()
-
-m = re.findall(new_version, old_whiteboard)
-if m is None or len(m) == 0:
-new_whiteboard = old_whiteboard + " target:" + new_version
-if dry_run:
-print("DRY RUN, we would set the whiteboard to:\n%s" 
%(new_whiteboard))
-else:
+if dry_run:
+print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+else:
+bug = self.bz.getbug(bugnr)
+print(bug)
+if bug.product != "LibreOffice":
+print("refusing to update bug with non-LO component")
+return;
+old_whiteboard = bug.getwhiteboard()
+
+m = re.findall(new_version, old_whiteboard)
+if m is None or len(m) == 0:
+new_whiteboard = old_whiteboard + " target:" + new_version
 bug.setwhiteboard(new_whiteboard)
 
 cgiturl = "http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s"; 
%(repo_name, commit.hexsha)
@@ -94,7 +95,7 @@ http://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" 
%(new_whiteboard))
+print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
 else:
 bug.addcomment(comment_msg)
 
@@ -179,6 +180,7 @@ def read_repo(repo_name):
 return repo
 
 def main(argv):
+global dry_run
 print(argv)
 help_text = 'libreoffice-bugzilla2.py -c commitid [-b branchname] [-r 
repo] [--dry-run]'
 try:
@@ -230,3 +232,5 @@ def main(argv):
 
 if __name__ == "__main__":
main(sys.argv[1:])
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-06-15 Thread Michael Stahl
 ciabot/libreoffice-bugzilla2.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3fdce0d4888960a21cca660a099fd34cd7336b42
Author: Michael Stahl 
Date:   Mon Jun 15 16:15:46 2015 +0200

libreoffice-bugzilla2.py: try to fix unscheduled 5.0 beta3 issue

... which results in beta4 instead of rc1 currently.

Change-Id: Ifd0a0dac3a7ac65b0a712646bb68670657744c69
Reviewed-on: https://gerrit.libreoffice.org/16294
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index baeff47..17fa6d1 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -131,8 +131,9 @@ def find_target_version(repo, branch):
 if len(beta_list) == 0:
 # no beta yet
 return base + ".0.0.beta0"
-if max(beta_list) == 3:
-# we only release three betas, therefore now the next will be 
a RC
+if max(beta_list) >= 2:
+# we only release two betas (except when we release three),
+# therefore now the next will be a RC
 return base + ".0.1"
 
 # normal beta
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-06-15 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b6ce17b9e05e4140280214e0f8751c364c2acd0
Author: Miklos Vajna 
Date:   Mon Jun 15 16:08:14 2015 +0200

ciabot: LO 5.0 has 3 betas

Change-Id: I00eadfe93500cb8ff5161a0b919c8fe58b422548

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 7bbac82..baeff47 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -131,8 +131,8 @@ def find_target_version(repo, branch):
 if len(beta_list) == 0:
 # no beta yet
 return base + ".0.0.beta0"
-if max(beta_list) == 2:
-# we only release two betas, therefore now the next will be a 
RC
+if max(beta_list) == 3:
+# we only release three betas, therefore now the next will be 
a RC
 return base + ".0.1"
 
 # normal beta
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-05-25 Thread Adolfo Jayme Barrientos
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0726a800b36120ec8383d1279a8102dd59f694b
Author: Adolfo Jayme Barrientos 
Date:   Sat May 23 04:48:49 2015 -0500

Update master_target to 5.1 series

Change-Id: I3d4625e6a350160c7cfc2de7907f6e97a2399ab5
Reviewed-on: https://gerrit.libreoffice.org/15872
Reviewed-by: Joren De Cuyper 
Tested-by: Joren De Cuyper 

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 923a01d..7bbac82 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "5.0.0"
+master_target = "5.1.0"
 bug_regex = "(?:tdf|fdo)#(\d+)"
 
 class FreedesktopBZ:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-04-02 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit f351b28bdacc287f1cdde6f2c9a985db23b0b52d
Author: Markus Mohrhard 
Date:   Thu Apr 2 22:11:11 2015 +

fix handling of multiple bugs mentioned in commit message

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index b4eb6c5..923a01d 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -34,7 +34,7 @@ from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
 master_target = "5.0.0"
-bug_regex = "(?:fdo|tdf)#(\d+)"
+bug_regex = "(?:tdf|fdo)#(\d+)"
 
 class FreedesktopBZ:
 bzclass = bugzilla.Bugzilla44
@@ -51,6 +51,7 @@ class FreedesktopBZ:
 self.bz.login(user=user, password=password)
 
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
+print(bugnr)
 bug = self.bz.getbug(bugnr)
 print(bug)
 if bug.product != "LibreOffice":
@@ -149,12 +150,13 @@ def get_commit(repo, commit_id):
 def find_bugid(repo, commit_id):
 commit = get_commit(repo, commit_id)
 summary_line = commit.summary
-m = re.search(bug_regex, summary_line)
-if m is None or len(m.groups()) == 0:
+regex = re.compile(bug_regex)
+m = regex.findall(summary_line)
+if m is None or len(m) == 0:
 print("no bugid found")
 sys.exit()
 
-return m.groups()
+return m
 
 def read_repo(repo_name):
 config = ConfigParser.ConfigParser()
@@ -199,11 +201,15 @@ def main(argv):
 commit = get_commit(repo, commit_id)
 
 if target_version is None:
+print("missing target version")
+print(opts)
 sys.exit()
 
 bz = FreedesktopBZ()
 bz.connect()
+print(bug_ids)
 for bug_id in bug_ids:
+print(bug_id)
 bz.update_whiteboard(commit, bug_id, target_version, branch, repo_name)
 
 if __name__ == "__main__":
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-04-02 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e11164c42cebd0c14356a449e4cfaa2a9a3529a7
Author: Markus Mohrhard 
Date:   Thu Apr 2 23:59:15 2015 +0200

next version will be 5.0

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index c861f9d..b4eb6c5 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "4.5.0"
+master_target = "5.0.0"
 bug_regex = "(?:fdo|tdf)#(\d+)"
 
 class FreedesktopBZ:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2015-01-24 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a422fe807af4d73dc2b1cbc59a251649b91eed8e
Author: Markus Mohrhard 
Date:   Sat Jan 24 21:52:16 2015 +0100

recognize tdf#12345 as well

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 480182f..c861f9d 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -34,7 +34,7 @@ from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
 master_target = "4.5.0"
-bug_regex = "fdo#(\d+)"
+bug_regex = "(?:fdo|tdf)#(\d+)"
 
 class FreedesktopBZ:
 bzclass = bugzilla.Bugzilla44
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-11-26 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f103071bccddd87fd11668d56567d62fe67704a
Author: Markus Mohrhard 
Date:   Wed Nov 26 23:49:39 2014 +

fix script for commits to stable branches

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 448b8b2..480182f 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -138,7 +138,7 @@ def find_target_version(repo, branch):
 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)
+return base + "." + str(int(max(micro_list)) + 1)
 
 return None
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-11-21 Thread Michael Stahl
 ciabot/libreoffice-bugzilla2.py |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b16c74e070044ca85af06ed620b9a9a3369876a9
Author: Michael Stahl 
Date:   Thu Nov 6 15:48:53 2014 +0100

libreoffice-bugzilla2.py: try to avoid modifying non-LO bugs

... which can happen when mis-typing bug ids.

Change-Id: I20d88a0aec83c7328d5ff6294adaa1e1f8d69a74

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 5e67ebe..e072f69 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -53,6 +53,9 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 bug = self.bz.getbug(bugnr)
 print(bug)
+if bug.product != "LibreOffice":
+print("refusing to update bug with non-LO component")
+return;
 old_whiteboard = bug.getwhiteboard()
 
 m = re.findall(new_version, old_whiteboard)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-11-21 Thread Miklos Vajna
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b98a721a46192647d2161491ad204144c07c5b69
Author: Miklos Vajna 
Date:   Fri Nov 21 18:44:02 2014 +0100

libreoffice-bugzilla2: 4.4 -> 4.5

Change-Id: I149adf0420901a58f2f7d56c49cddaaa3416b30b

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index a4f862a..5e67ebe 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -33,7 +33,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "4.4.0"
+master_target = "4.5.0"
 bug_regex = "fdo#(\d+)"
 
 class FreedesktopBZ:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-11-09 Thread Michael Stahl
 ciabot/libreoffice-bugzilla2.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6af188d346447a92b8e41d68c7aea190521214a9
Author: Michael Stahl 
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 
Tested-by: Markus Mohrhard 

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
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-10-27 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 768897fc4033b0600ca2bee899195bdd299412a4
Author: Markus Mohrhard 
Date:   Mon Oct 27 13:33:12 2014 +0100

write cookie and token into tmp directory

This helps the server as it otherwise has some problems with our user
configuration.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 7d2adeb..322ad82 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -47,7 +47,7 @@ class FreedesktopBZ:
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
 password = config.get('bugzilla', 'password')
-self.bz = self.bzclass(url=url)
+self.bz = self.bzclass(url=url, cookiefile = "/tmp/cookie", tokenfile 
= "/tmp/token")
 self.bz.login(user=user, password=password)
 
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-10-27 Thread Markus Mohrhard
 ciabot/libreoffice-bugzilla2.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c1f9d3a8334053c53b90a81b6931a9ea3dde7a44
Author: Markus Mohrhard 
Date:   Mon Oct 27 11:00:25 2014 +0100

add missing new line

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 1a72143..7d2adeb 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -72,6 +72,7 @@ It has been pushed to "%s":
 %s
 
 %s
+
 It will be available in %s.
 
 The patch should be included in the daily builds available at
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits