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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 4e78ae753b773bee06246685d300a02120f3f7e1
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Nov 18 10:10:48 2015 +0100

    make sure to decode the tarball URI to avoid problems in tarball.rb
    
    tarball.rb expects unencoded names, so if we do not decode as early as
    project creation we will eventually pass an encoded name to tarball.rb
    at buildtime and tarball.rb will complain as it cannot parse encoded
    names with +dfsg for example
---
 lib/projects.rb       | 2 +-
 test/test_projects.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/projects.rb b/lib/projects.rb
index 8bc38a3..cb46289 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -227,7 +227,7 @@ class ProjectFactory
           component = repo.path.split('/')[0..-2].join('/')
           name = repo.path.split('/')[-1]
           pro = Project.new(name, component, branch: repo.branch)
-          pro.upstream_scm = CI::SCM.new('tarball', repo.tarball)
+          pro.upstream_scm = CI::SCM.new('tarball', URI.decode(repo.tarball))
           ret << pro
         end
       end
diff --git a/test/test_projects.rb b/test/test_projects.rb
index 7e8675a..35c3d09 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -190,6 +190,6 @@ class ProjectTest < TestCase
     assert_equal('git.debian.org:/git/pkg-kde/qt/qtx11extras', pro.packaging_scm_scm.url)
     assert_equal('experimental', pro.packaging_scm_scm.branch)
     assert_equal('tarball', pro.upstream_scm.type)
-    assert_equal('http://abc.tar.xz', pro.upstream_scm.url)
+    assert_equal('http://abc+dfsg.tar.xz', pro.upstream_scm.url)
   end
 end

-- 
ci-tooling packaging