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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit ec8fc9fb8708dd0cd8f94dc5c21328567b136247
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Mar 3 18:07:46 2015 +0100

    Make sure we add the right repos for custom_ci, fix a rubocop issue
---
 dci/source.rb   | 2 +-
 lib/projects.rb | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 78c593f..f495fda 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -113,7 +113,7 @@ Dir.chdir(ARGV[1]) do
   fail 'Failed to create a tarball' unless system("tar -cf --exclude .git #{tar} source")
   fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
 
-  system("cp -aR packaging/debian source/") if FORMAT == :quilt
+  system('cp -aR packaging/debian source/') if FORMAT == :quilt
 
   Dir.chdir('source/') do
     fail 'Failed to create changelog entry' unless system({ 'DEBFULLNAME' => 'Debian CI',
diff --git a/lib/projects.rb b/lib/projects.rb
index 1a7f87a..440ceb8 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -42,6 +42,7 @@ class Project
         @series_branches = []
         @autopkgtest = false
         @packaging_scm = "#{url_base}/#{component}/#{name}"
+        puts @packaging_scm
 
         # FIXME: git dir needs to be set somewhere, somehow, somewhat, lol, kittens?
         FileUtils.mkdir_p("git/#{component}") unless Dir.exist?("git/#{component}")
@@ -146,14 +147,16 @@ class ProjectFactory
         end
       end
     when "custom_ci"
-      repos = []
       value.each do |custom_ci|
+        repos = []
         if custom_ci['type'] == 'github'
           require 'octokit'
           if custom_ci['repos'] == ['all']
             Octokit.organization_repositories(custom_ci['org']).each do |octo_repo|
               repos << octo_repo[:name]
             end
+          else
+            repos = custom_ci['repos']
           end
         elsif custom_ci['repos'] == ['all'] && custom_ci['type'] != 'github'
           repos = %x[ssh #{custom_ci['git_host']} ls /].chop!.gsub!('.git', '').split(' ')

-- 
ci-tooling packaging