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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit ddec8fea196ae555a1a1a88876c207436c83f0af
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Mar 25 13:34:59 2015 +0100

    fix binding context rendering and test for it
---
 lib/ci/upstream_scm.rb    | 6 ++++--
 test/test_upstream_scm.rb | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ci/upstream_scm.rb b/lib/ci/upstream_scm.rb
index 17be5fc..f68f643 100644
--- a/lib/ci/upstream_scm.rb
+++ b/lib/ci/upstream_scm.rb
@@ -22,7 +22,9 @@ class UpstreamSCM
       @packaging_branch = scm.instance_variable_get(:@packaging_branch)
     end
 
-    public :binding
+    def render(template_str)
+      ERB.new(template_str).result(binding)
+    end
   end
 
   # @return [String] a type identifier (e.g. 'git', 'svn')
@@ -80,7 +82,7 @@ class UpstreamSCM
       next unless override_value
       # Version would be float. Coerce into string.
       override_value = override_value.to_s
-      override_value = ERB.new(override_value).result(context.binding)
+      override_value = context.render(override_value)
       next unless override_value
       instance_variable_set("@#{var}", override_value)
     end
diff --git a/test/test_upstream_scm.rb b/test/test_upstream_scm.rb
index 77cd290..8ed1351 100644
--- a/test/test_upstream_scm.rb
+++ b/test/test_upstream_scm.rb
@@ -22,6 +22,7 @@ class UpstreamSCMTest < TestCase
     assert_equal('master', scm.branch)
     scm = UpstreamSCM.new(qt, 'kubuntu_unstable', '/')
     assert_equal('5.4', scm.branch)
+    assert_equal('https://gitorious.org/qt/qtbase.git', scm.url)
   end
 
   def test_override

-- 
ci-tooling packaging