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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Mon Nov 30 11:24:45 UTC 2015


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

The following commit has been merged in the master branch:
commit db0a42f9662423c919e746e66c5fb896c4ef1ddd
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Nov 30 12:14:05 2015 +0100

    recursively copy debian so we can have symlinks of debian as well
---
 test/test_projects.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test_projects.rb b/test/test_projects.rb
index 4a80863..e77761c 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -21,7 +21,8 @@ class ProjectTest < TestCase
     Dir.mktmpdir do |dir|
       `git clone #{repo} #{dir}`
       Dir.chdir(dir) do
-        FileUtils.cp_r("#{data}/debian", '.')
+        Dir.mkdir('debian') unless Dir.exist?('debian')
+        FileUtils.cp_r(Dir.glob("#{data}/debian/*"), 'debian')
         `git add *`
         `git commit -m 'commitmsg'`
         branches.each { |branch| `git branch #{branch}` }

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list