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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Apr 30 08:16:16 UTC 2015


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

The following commit has been merged in the master branch:
commit 147f3d9c426d1d083df39e92272a8cd3418ca825
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 30 10:16:02 2015 +0200

    only copy source if dir is !empty
---
 kci/builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 05c5585..7d60e81 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -82,7 +82,7 @@ FileUtils.rm_r('build') if File.exist?('build')
 FileUtils.mkpath('build/source/')
 
 # copy upstream sources around
-if Dir.exist?('source')
+if Dir.exist?('source') && !Dir.glob('source/*').empty?
   abort 'Failed to copy source' unless system('cp -r source/* build/source/')
   Dir.chdir('build/source') do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list