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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 35d860ff44bb685aec96f84ad150252b42fc747d
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 23:21:00 2014 +0100

    Pass the release via options
---
 dci/source.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 32573b4..bae7de3 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -6,8 +6,8 @@ require 'json'
 require_relative '../lib/debian/changelog'
 require_relative '../lib/debian/control'
 require_relative '../lib/logger'
+
 raise "No workspace dir defined!" unless ARGV[1]
-raise "No release defined!" unless ARGV[2]
 
 options = {}
 OptionParser.new do | opts |
@@ -19,10 +19,17 @@ OptionParser.new do | opts |
     opts.on('-w dir', '--workspace dir', 'Workspace dir to find repository mappings') do |dir|
         options[:workspace] = dir
     end
+
+    opts.on('-R release', '--release release', 'Build for release') do |release|
+        options[:release] = release
+    end
 end.parse!
 
+raise "Release is not optional!" unless options[:release]
+
 $logger = new_logger
-release = ARGV[2]
+
+logger.debug("Arguments passed were #{ARGV}")
 
 def run_cmd(cmd)
     retry_count = 0
@@ -50,9 +57,9 @@ if !options[:repos].nil?
         if File.exists? EXTRA_REPOS
             extra_repos = JSON::parse(File.read(EXTRA_REPOS))
             options[:repos].each do |repo|
-                system("echo 'deb #{extra_repos[repo]['url']} #{release} main' >> /etc/apt/sources.list.d/extra_repos.list")
+                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']} #{release} main")
+                $logger.info("Added deb #{extra_repos[repo]['url']} #{options[:release]} main")
             end
         end
     end
@@ -101,7 +108,7 @@ Dir.chdir(ARGV[1]) do
     Dir.chdir('source/') do
         raise 'Failed to create changelog entry' unless system({'DEBFULLNAME' => 'Debian CI',
                                                                 'DEBEMAIL' => 'null at debian.org'},
-                                                                "dch -b -v #{version} -D #{release} 'Automatic Debian Build'")
+                                                                "dch -b -v #{version} -D #{options[:release]} 'Automatic Debian Build'")
     end
 
     # Rip out locale install

-- 
ci-tooling packaging