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

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


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

The following commit has been merged in the master branch:
commit 3440264feeea4032032265449afea2c15c325107
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Oct 7 15:45:22 2015 +0200

    Make sure we copy everything from the imager data path
---
 dci/imager.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 6f7d16f..2b3a0c2 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -194,7 +194,8 @@ Dir.chdir('build') do
   File.write('config/archives/dci.key', REPO_KEY)
 
   FileUtils.mkdir_p('config/includes.chroot/lib/live/config')
-  FileUtils.cp("#{File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))}/data/imager/0090-sddm", "config/includes.chroot/lib/live/config")
+  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