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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 5a0d62cd8179bbd695d2e74f7e666905e5caeef8
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 19:59:33 2014 +0100

    Pass repo as a key first
---
 dci/build.rb  | 4 ++--
 dci/source.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dci/build.rb b/dci/build.rb
index 0710f88..987a9b0 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -44,8 +44,8 @@ else
             if File.exists? EXTRA_REPOS
                 extra_repos = JSON::parse(File.read(EXTRA_REPOS))
                 options[:repos].each do |repo|
-                    system("echo '#{repo['url']} #{package_release} main' >> /etc/apt/sources.list.d/extra_repos.list")
-                    system("echo '#{repo['key']}' | apt-key add -")
+                    system("echo '#{repo[repo]['url']} #{package_release} main' >> /etc/apt/sources.list.d/extra_repos.list")
+                    system("echo '#{repo[repo]['key']}' | apt-key add -")
                 end
             end
         end
diff --git a/dci/source.rb b/dci/source.rb
index 9cb1d7e..f7586d5 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -51,8 +51,8 @@ if !options[:repos].nil?
         if File.exists? EXTRA_REPOS
             extra_repos = JSON::parse(File.read(EXTRA_REPOS))
             options[:repos].each do |repo|
-                system("echo '#{repo['url']} #{release} main' >> /etc/apt/sources.list.d/extra_repos.list")
-                system("echo '#{repo['key']}' | apt-key add -")
+                system("echo '#{repo[repo]['url']} #{release} main' >> /etc/apt/sources.list.d/extra_repos.list")
+                system("echo '#{repo[repo]['key']}' | apt-key add -")
             end
         end
     end

-- 
ci-tooling packaging