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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit a558d505f3eda9243fcbc8159bcbc92be2b0f40f
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Apr 28 14:36:16 2015 +0200

    reduce copy verbosity
---
 kci/build_source.rb | 6 +++---
 kci/builder.rb      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kci/build_source.rb b/kci/build_source.rb
index a65cc37..f2cdcf9 100755
--- a/kci/build_source.rb
+++ b/kci/build_source.rb
@@ -51,7 +51,7 @@ FileUtils.mkpath('build/source/')
 
 # copy upstream sources around
 if Dir.exist?('source')
-  abort 'Failed to copy source' unless system('cp -rv source/* build/source/')
+  abort 'Failed to copy source' unless system('cp -r source/* build/source/')
   Dir.chdir('build/source') do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))
     FileUtils.rm_rf(Dir.glob('**/.git'))
@@ -66,14 +66,14 @@ if Dir.exist?('source')
   end
 
   # Copy packaging
-  unless system('cp -rv packaging/debian build/source/')
+  unless system('cp -r packaging/debian build/source/')
     abort 'Failed to copy packaging'
   end
 else
   # This is a native package as we have no upstream source directory.
   # TODO: quite possibly this should be porperly validated via source format and
   #       or changelog version format.
-  unless system('cp -rv packaging/* build/source/')
+  unless system('cp -r packaging/* build/source/')
     abort 'Failed to copy packaging'
   end
 end
diff --git a/kci/builder.rb b/kci/builder.rb
index dc04065..05c5585 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -83,7 +83,7 @@ FileUtils.mkpath('build/source/')
 
 # copy upstream sources around
 if Dir.exist?('source')
-  abort 'Failed to copy source' unless system('cp -rv source/* build/source/')
+  abort 'Failed to copy source' unless system('cp -r source/* build/source/')
   Dir.chdir('build/source') do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))
     FileUtils.rm_rf(Dir.glob('**/.git'))
@@ -98,14 +98,14 @@ if Dir.exist?('source')
   end
 
   # Copy packaging
-  unless system('cp -rv packaging/debian build/source/')
+  unless system('cp -r packaging/debian build/source/')
     abort 'Failed to copy packaging'
   end
 else
   # This is a native package as we have no upstream source directory.
   # TODO: quite possibly this should be porperly validated via source format and
   #       or changelog version format.
-  unless system('cp -rv packaging/* build/source/')
+  unless system('cp -r packaging/* build/source/')
     abort 'Failed to copy packaging'
   end
 end

-- 
ci-tooling packaging