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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 1b62b7a2264ed1069d4ab853d9e9e2d7e3855b43
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jan 7 10:32:00 2016 +0100

    restore compatibility with previous build_source glob behavior
    
    if the source dir does not exist the previous code would ignore it where
    the new code doesn't and actively raises
    
    to prevent test fails restore the old behavior support, but ideally we
    should deprecate this behavior asap on account of it being rubbish
---
 lib/ci/build_source.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index c14ed79..9f41c2a 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -40,7 +40,6 @@ module CI
 
     def copy_source
       # copy sources around
-      p BUILD_DIR
       FileUtils.rm_rf(BUILD_DIR, verbose: true)
 
       # Allow support for format 1.0 and quilt
@@ -51,8 +50,15 @@ module CI
       end
 
       FileUtils.mkpath("#{BUILD_DIR}/source")
-      # NOTE: /. is fileutils notation for recursive content
-      FileUtils.cp_r("#{source_dir}/.", "#{BUILD_DIR}/source/", verbose: true)
+      # Legacy behavior was to ignore missing source directories. Using the
+      # fileutils /. notation does not allow for this though.
+      # FIXME: deprecate away from this and let missing sources fail!
+      #   if a native doesn't have packaging or a non-native no source that is
+      #   rather a problem
+      if Dir.exist?(source_dir)
+        # NOTE: /. is fileutils notation for recursive content
+        FileUtils.cp_r("#{source_dir}/.", "#{BUILD_DIR}/source/", verbose: true)
+      end
 
       %w(.bzr .git .hg .svn debian).each do |dir|
         FileUtils.rm_rf(Dir.glob("#{BUILD_DIR}/source/**/#{dir}"))

-- 
ci-tooling packaging