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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Wed Oct 7 13:52:47 UTC 2015


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

The following commit has been merged in the master branch:
commit 4a0b65fc81c748dab8a2d1809d010ec4f01442f5
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Oct 7 15:52:43 2015 +0200

    Fix FileUtils.cp_r invocation from last commit
---
 dci/imager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 2b3a0c2..a6c39f6 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -194,7 +194,7 @@ Dir.chdir('build') do
   File.write('config/archives/dci.key', REPO_KEY)
 
   FileUtils.mkdir_p('config/includes.chroot/lib/live/config')
-  FileUtils.cp_r("#{File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))}/data/imager/*",
+  FileUtils.cp_r("#{File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))}/data/imager/.",
                  "config/includes.chroot/lib/live/config")
 
   system('lb build')

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list