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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 13bbda893a24eacbf600a55e6e0675cc4aebcb6d
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Dec 18 17:06:13 2014 +0100

    Ignore the default repo
---
 dci/build.rb  | 2 ++
 dci/source.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dci/build.rb b/dci/build.rb
index 14c45e6..8d2ae04 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -46,6 +46,8 @@ else
             if File.exists? 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']} #{package_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']} #{package_release} main to the sources")
diff --git a/dci/source.rb b/dci/source.rb
index 1d1964b..be66249 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -60,6 +60,8 @@ if !options[:repos].nil? && options[:repos].count > 1
         if File.exists? 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")

-- 
ci-tooling packaging