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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Jan 7 09:12:37 UTC 2016


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

The following commit has been merged in the master branch:
commit 395e7ebb106b9b70ad356302c722e2cd48a9e9fc
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 4 14:56:38 2016 +0100

    use build_dir consistently
---
 lib/ci/build_source.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 6299823..c14ed79 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -52,10 +52,10 @@ module CI
 
       FileUtils.mkpath("#{BUILD_DIR}/source")
       # NOTE: /. is fileutils notation for recursive content
-      FileUtils.cp_r("#{source_dir}/.", 'build/source/', verbose: true)
+      FileUtils.cp_r("#{source_dir}/.", "#{BUILD_DIR}/source/", verbose: true)
 
       %w(.bzr .git .hg .svn debian).each do |dir|
-        FileUtils.rm_rf(Dir.glob("build/source/**/#{dir}"))
+        FileUtils.rm_rf(Dir.glob("#{BUILD_DIR}/source/**/#{dir}"))
       end
     end
 

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list