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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 50fe2799dab327504467884ea800296157a865fc
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 10:03:27 2015 +0100

    resolve violations in imager.rb
---
 dci/imager.rb | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index a6c39f6..475a298 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -70,22 +70,22 @@ def workarounds
   end
 
   # Workarounds for ARM
-  if RbConfig::CONFIG['host_cpu'] == 'arm'
-    Dir.glob('config/package-lists/memtest.list.*').each do |f|
-      File.delete(f)
-    end
+  return unless RbConfig::CONFIG['host_cpu'] == 'arm'
+  Dir.glob('config/package-lists/memtest.list.*').each do |f|
+    File.delete(f)
+  end
 
-    contents = File.read('config/package-lists/desktop.list.chroot')
-    File.open('config/package-lists/desktop.list.chroot', 'w') do |f|
-      contents.gsub!(/i965-va-driver/, '')
-      f.puts(contents)
-    end
+  contents = File.read('config/package-lists/desktop.list.chroot')
+  File.open('config/package-lists/desktop.list.chroot', 'w') do |f|
+    contents.gsub!(/i965-va-driver/, '')
+    f.puts(contents)
   end
 end
 
 def deb_from_url(url)
-  FileUtils.mkdir_p('config/packages.chroot/') unless Dir.exist?('config/packages.chroot')
-  system("wget -P config/packages.chroot/ #{url}")
+  packages_chroot = 'config/packages.chroot/'
+  FileUtils.mkdir_p(packages_chroot) unless Dir.exist?(packages_chroot)
+  system("wget -P #{packages_chroot} #{url}")
 end
 
 logger = DCILogger.instance
@@ -142,7 +142,6 @@ Dir.chdir('build') do
     exit 1
   end
 
-
   system("lb config --config kde-desktop \
   --distribution #{RELEASE} \
   -m #{MIRROR} \
@@ -162,11 +161,12 @@ Dir.chdir('build') do
   # Copy over bootloader modifications post config
   case FLAVOR
   when /.*netrunner.*desktop/
-    FileUtils.mkdir_p('config/bootloaders/isolinux/') unless Dir.exist?('config/bootloaders/isolinux/')
-    system('cp -avRL /usr/share/syslinux/themes/netrunner/isolinux-live/* config/bootloaders/isolinux/')
+    isolinux_dir = 'config/bootloaders/isolinux/'
+    FileUtils.mkdir_p(isolinux_dir) unless Dir.exist?(isolinux_dir)
+    system('cp -avRL /usr/share/syslinux/themes/netrunner/isolinux-live/* '\
+           "#{isolinux_dir}")
   end
 
-
   packages.each do |package|
     File.write('config/package-lists/netrunner.list.chroot',
                package + "
", mode: 'a')
@@ -184,18 +184,22 @@ Dir.chdir('build') do
     end
   end
 
-  File.delete('config/archives/dci.list') if File.exist? 'config/archives/dci.list'
+  dci_archive = 'config/archives/dci.list'
+  File.delete(dci_archive) if File.exist? dci_archive
   repos.each do |repo|
     logger.info("Adding #{repo} to ISO")
-    File.write('config/archives/dci.list',
-               "deb http://pangea-data.s3.amazonaws.com/dci/#{repo}/debian #{RELEASE} main" + "
", mode: 'a')
+    url = "http://pangea-data.s3.amazonaws.com/dci/#{repo}/debian"
+    line = "deb #{url} #{RELEASE} main
"
+    File.write(dci_archive, line, mode: 'a')
   end
 
   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/.",
-                 "config/includes.chroot/lib/live/config")
+  wtf_random_dir = File.expand_path(File.dirname(File.dirname(__dir__)))
+  wtf_random_path = "#{wtf_random_dir}/data/imager/."
+  FileUtils.cp_r(wtf_random_path,
+                 'config/includes.chroot/lib/live/config')
 
   system('lb build')
 

-- 
ci-tooling packaging