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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit c01294f37ea5ba35a4f441dd5033c4cb7e21d26a
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Nov 30 17:59:43 2015 +0100

    Make sure we retry a couple of times since downloading binaries
    can still fail.
---
 lib/ci/build_binary.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/ci/build_binary.rb b/lib/ci/build_binary.rb
index 8b0eb7e..90fb9dc 100644
--- a/lib/ci/build_binary.rb
+++ b/lib/ci/build_binary.rb
@@ -1,6 +1,7 @@
 require 'fileutils'
 
 require_relative 'source'
+require_relative '../lib/retry'
 
 module CI
   class PackageBuilder
@@ -13,16 +14,18 @@ module CI
       def self.resolve(dir)
         fail "Can't find #{RESOLVER_BIN}!" unless File.executable?(RESOLVER_BIN)
 
-        system('sudo',
-               RESOLVER_BIN,
-               '--control',
-               "#{dir}/debian/control")
+        Retry.retry_it(times: 5) do
+          system('sudo',
+                 RESOLVER_BIN,
+                 '--control',
+                 "#{dir}/debian/control")
+        end
       end
     end
 
     def extract
       FileUtils.rm_rf(BUILD_DIR, verbose: true)
-      fail "Something went terribly wrong with extracting the source" unless
+      fail 'Something went terribly wrong with extracting the source' unless
        system('dpkg-source', '-x', @source.dsc, BUILD_DIR)
     end
 
@@ -50,7 +53,7 @@ module CI
       Dir.mkdir(RESULT_DIR) unless Dir.exist?(RESULT_DIR)
       changes = Dir.glob("#{BUILD_DIR}/../*.changes")
 
-      changes.select! {|e| !e.include? 'source.changes' }
+      changes.select! { |e| !e.include? 'source.changes' }
 
       unless changes.size == 1
         fail "Not exactly one changes file WTF -> #{changes}"
@@ -64,7 +67,6 @@ module CI
 
       fail "Could not find #{@source.dsc}" unless File.exist? @source.dsc
 
-
       extract
       DependencyResolver.resolve(BUILD_DIR)
 

-- 
ci-tooling packaging