[SCM] ci-tooling packaging branch, master, updated. 3ba49fad92e50b16a380fd3236996fd30c40587e

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=8967bb0

The following commit has been merged in the master branch:
commit 8967bb0079468110dc4be9c937ed3f0f85e4949a
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Dec 11 09:13:38 2014 +0100

    Don't fail on apt-get update and some other essential commands
---
 dci/source.rb | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 9c613c6..f301625 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -1,13 +1,32 @@
 require 'date'
 require 'fileutils'
+require 'logger'
 require_relative '../lib/debian/changelog'
 require_relative '../lib/debian/control'
 
 raise "No workspace dir defined!" unless ARGV[1]
 raise "No release defined!" unless ARGV[2]
 
-system("apt-get update && apt-get -y dist-upgrade")
-system("apt-get -y install devscripts lsb-release")
+$logger = Logger.new(STDOUT)
+
+def run_cmd(cmd)
+    retry_count = 0
+    begin
+        if retry_count <= 5
+            raise if not system(cmd)
+        else
+            logger.fatal("#{cmd} keeps failing! :(")
+        end
+    rescue RuntimeError => e
+        $logger.warning("Trying to run #{cmd} again!")
+        retry_count += 1
+        retry
+    end
+end
+
+# These should never fail
+run_cmd('apt-get update && apt-get -y dist-upgrade')
+run_cmd('apt-get -y install devscripts lsb-release')
 
 release = ARGV[2]
 

-- 
ci-tooling packaging