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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Feb 24 15:50:46 UTC 2015


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

The following commit has been merged in the master branch:
commit 11f11f2aa39187acf20edbcef31e3b30d9e1b32a
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Feb 24 16:50:22 2015 +0100

    Fix up some issues in projects.rb
---
 lib/projects.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/projects.rb b/lib/projects.rb
index 91782de..1a7f87a 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -90,7 +90,8 @@ class Project
                 end
 
                 if component == 'qt'
-                    upstream_scm['url'] = "https://gitorious.org/qt/#{name}.git"
+                    upstream_scm['url'] ||= "https://gitorious.org/qt/#{name}.git"
+                    upstream_scm['branch'] ||= '5.4'
                 end
 
                 default_repo_url = "git://anongit.kde.org/#{name.chomp('-qt4')}"
@@ -160,10 +161,9 @@ class ProjectFactory
           repos = custom_ci['repos']
         end
 
-        puts repos
         repos.each do |repo|
           begin
-            self << Project.new(repo, custom_ci['org'], custom_ci['git_host'], type: type)
+            ret << Project.new(repo, custom_ci['org'], custom_ci['git_host'], type: type)
           rescue
           end
         end

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list