[SCM] ci-tooling packaging branch, master, updated. 6a22a5ef96775ef8d8bda897073f74f0a2bfd0a8
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Sep 17 13:17:24 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=6a22a5e
The following commit has been merged in the master branch:
commit 6a22a5ef96775ef8d8bda897073f74f0a2bfd0a8
Author: Harald Sitter <sitter at kde.org>
Date: Thu Sep 17 15:16:37 2015 +0200
style fixes for kci.rb and dci.rb
---
lib/dci.rb | 29 ++++++++++++++++-------------
lib/kci.rb | 4 ++++
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/lib/dci.rb b/lib/dci.rb
index b5f0a9d..f06ace0 100644
--- a/lib/dci.rb
+++ b/lib/dci.rb
@@ -4,25 +4,28 @@ require_relative 'logger'
$logger = DCILogger.instance
def dci_run_cmd(cmd)
- retry_count = 0
- begin
- if retry_count <= 5
- raise unless system(cmd)
- else
- $logger.fatal("#{cmd} keeps failing! :(")
- exit 1
- end
- rescue RuntimeError
- $logger.warn("Trying to run #{cmd} again!")
- retry_count += 1
- sleep(retry_count * 20)
- retry
+ retry_count = 0
+ begin
+ if retry_count <= 5
+ fail unless system(cmd)
+ else
+ $logger.fatal("#{cmd} keeps failing! :(")
+ exit 1
end
+ rescue RuntimeError
+ $logger.warn("Trying to run #{cmd} again!")
+ retry_count += 1
+ sleep(retry_count * 20)
+ retry
+ end
end
+# Debian CI specific data.
module DCI
extend CI
+
private
+
def self.data
return @data if defined?(@data)
file = File.join(File.dirname(__dir__), 'data', 'dci.yaml')
diff --git a/lib/kci.rb b/lib/kci.rb
index 2981300..82d28f6 100644
--- a/lib/kci.rb
+++ b/lib/kci.rb
@@ -1,7 +1,11 @@
require_relative 'ci'
+
+# Kubuntu CI specific data.
module KCI
extend CI
+
private
+
def self.data
return @data if defined?(@data)
file = File.join(File.dirname(__dir__), 'data', 'kci.yaml')
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list