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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 59c977cbebd3e767035ac29a5e17cac3fcdbabd8
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Feb 26 15:13:43 2015 +0100

    use a general purpose run() function that eatsmydata
    
    also put debug there conditionally to avoid pointless slowdown
---
 kci/install_check.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kci/install_check.rb b/kci/install_check.rb
index b6947a6..d3a9477 100755
--- a/kci/install_check.rb
+++ b/kci/install_check.rb
@@ -114,6 +114,13 @@ class CiPPA
 
   private
 
+  def run(cmd, args)
+    args.unshift('--')
+    args.unshift(cmd)
+    LOG.debug "eatmydata #{args.join(' ')}" if LOG.debug?
+    system('eatmydata', *args)
+  end
+
   def apt(cmd, caller_args = [])
     args = []
     args << '--force-yes'
@@ -121,8 +128,7 @@ class CiPPA
     args << '-o' << 'Debug::pkgProblemResolver=true'
     args << cmd.to_s
     args += caller_args
-    LOG.info "apt-get #{args.join(' ')}"
-    system('apt-get', *args)
+    run('apt-get', args)
   end
 
   def pin!
@@ -140,7 +146,7 @@ class CiPPA
     args << '-y'
     args << '-r' if to_remove
     args << "ppa:kubuntu-ci/#{@type}"
-    system('apt-add-repository', *args)
+    run('apt-add-repository', args)
     updated = apt(:update)
     if !updated && !to_remove
       # Updated failed. Rip the PPA out again.

-- 
ci-tooling packaging