[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=aa21a41

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

    fix violations in source.rb
---
 dci/source.rb | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index a36bd0e..101b29d 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -33,38 +33,47 @@ end.parse!
 
 abort 'Release is not optional!' unless options[:release]
 
-$logger = DCILogger.instance
+logger = DCILogger.instance
 
-$logger.info("Arguments passed were #{ARGV}")
-$logger.info("Parsed #{options}")
+logger.info("Arguments passed were #{ARGV}")
+logger.info("Parsed #{options}")
 
-$logger.info("Adding custom repos #{options[:repos]}")
+logger.info("Adding custom repos #{options[:repos]}")
 
 # Skip if there is only one repo in the options, since thats the 'default'
 #   config
 # FIXME: This is a workaround till I figure out how to make ruby parse empty
 #   values for options
 if !options[:repos].nil? && options[:repos].count > 1
-  File.delete('/etc/apt/sources.list.d/extra_repos.list') if File.exist?('/etc/apt/sources.list.d/extra_repos.list')
+  extra_file = '/etc/apt/sources.list.d/extra_repos.list'
+  File.delete(extra_file) if File.exist?(extra_file)
 
   Dir.chdir(options[:workspace]) do
     EXTRA_REPOS = 'extra_repos.json'
-    if File.exist? EXTRA_REPOS
-      extra_repos = JSON.parse(File.read(EXTRA_REPOS))
-      options[:repos].each do |repo|
-        # Default repos are ignored since they should already be in the chroot
-        next if repo == 'default'
-        system("echo 'deb #{extra_repos[repo]['url']} #{options[:release]} main' >> /etc/apt/sources.list.d/extra_repos.list")
-        system("echo '#{extra_repos[repo]['key']}' | apt-key add -")
-        $logger.info("Added deb #{extra_repos[repo]['url']} #{options[:release]} main")
-      end
+    next unless File.exist? EXTRA_REPOS
+    extra_repos = JSON.parse(File.read(EXTRA_REPOS))
+    options[:repos].each do |repo|
+      # Default repos are ignored since they should already be in the chroot
+      next if repo == 'default'
+      url = extra_repos[repo]['url']
+      key = extra_repos[repo]['key']
+      system("echo 'deb #{url} #{package_release} main' >> #{extra_file}")
+      system("echo '#{key}' | apt-key add -")
+      logger.info("Added deb #{url} #{package_release} main to the sources")
     end
   end
-end
 
 # These should never fail
 dci_run_cmd('apt-get update && apt-get -y dist-upgrade')
-dci_run_cmd('apt-get -y install devscripts lsb-release locales libdistro-info-perl pbuilder aptitude')
+packages = %w(
+  devscripts
+  lsb-release
+  locales
+  libdistro-info-perl
+  pbuilder
+  aptitude
+)
+dci_run_cmd("apt-get -y install #{packages}")
 
 Dir.chdir(ARGV[1]) do
   # Get source name and what not
@@ -74,7 +83,7 @@ Dir.chdir(ARGV[1]) do
   s = nil
   Dir.chdir(PACKAGING_DIR) do
     s = Debian::Source.new(Dir.pwd)
-    $logger.info "Building package of #{s.format.type} type"
+    logger.info "Building package of #{s.format.type} type"
     source_dir = PACKAGING_DIR if s.format.type == :native
   end
 
@@ -146,7 +155,7 @@ Dir.chdir(ARGV[1]) do
       package_name = File.basename(install_file_path, '.install')
       lintian_overrides_path = install_file_path.gsub('.install',
                                                       '.lintian-overrides')
-      $logger.info("#{package_name} is now empty, trying to add lintian" \
+      logger.info("#{package_name} is now empty, trying to add lintian" \
                    ' override')
       File.open(lintian_overrides_path, 'a') do |file|
         file.write("#{package_name}: empty-binary-package
")
@@ -185,4 +194,4 @@ Dir.chdir(ARGV[1]) do
   end
 end
 
-$logger.close
+logger.close

-- 
ci-tooling packaging