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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Wed Apr 29 14:34:46 UTC 2015


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

The following commit has been merged in the master branch:
commit 7a50aa24433bdaab015c773ec38c78042d1bc4e4
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 29 16:34:32 2015 +0200

    Copy files from dir, not the dir itself
---
 dci/imager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index cc0211f..6e95be9 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -163,7 +163,7 @@ Dir.chdir('build') do
   case FLAVOR
   when /.*netrunner.*desktop/
     FileUtils.mkdir_p('config/bootloaders/syslinux/') unless Dir.exist?('config/bootloaders/syslinux/')
-    system('cp -aR /usr/share/syslinux/themes/netrunner/syslinux-live config/bootloaders/syslinux/')
+    system('cp -aR /usr/share/syslinux/themes/netrunner/syslinux-live/* config/bootloaders/syslinux/')
   end
 
 

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list