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 <guil...@libreoffice.org>
AuthorDate: Sat Feb 22 03:32:25 2020 +0100
Commit: Guilhem Moulin <guil...@libreoffice.org>
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 <https://www.gnu.org/licenses/>.
#
@@ -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
