[SCM] ci-tooling packaging branch, master, updated. 008bd070d24170007f6bef89a664e0442414e4ec
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Dec 17 22:36:31 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=008bd07
The following commit has been merged in the master branch:
commit 008bd070d24170007f6bef89a664e0442414e4ec
Author: Rohan Garg <rohan at kde.org>
Date: Wed Dec 17 23:36:20 2014 +0100
Make sure the repos array is not empty as well
---
dci/source.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dci/source.rb b/dci/source.rb
index 525dc54..1826dc0 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -28,7 +28,8 @@ raise "Release is not optional!" unless options[:release]
$logger = new_logger
-$logger.debug("Arguments passed were #{ARGV}")
+$logger.info("Arguments passed were #{ARGV}")
+$logger.info("Parsed #{options}")
def run_cmd(cmd)
retry_count = 0
@@ -39,7 +40,7 @@ def run_cmd(cmd)
$logger.fatal("#{cmd} keeps failing! :(")
exit 1
end
- rescue RuntimeError => e
+ rescue RuntimeError
$logger.warn("Trying to run #{cmd} again!")
retry_count += 1
sleep(retry_count * 20)
@@ -48,7 +49,7 @@ def run_cmd(cmd)
end
$logger.info("Adding custom repos #{options[:repos]}")
-if !options[:repos].nil?
+if !options[:repos].nil? && !options[:repos].empty?
File.delete('/etc/apt/sources.list.d/extra_repos.list') if File.exist?('/etc/apt/sources.list.d/extra_repos.list')
Dir.chdir(options[:workspace]) do
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list