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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 64b97e54cf33c42425ad8a0c25bc90522be26cce
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jun 26 07:11:08 2015 +0200

    fix consumer creation
---
 lib/lp.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lp.rb b/lib/lp.rb
index 03020b7..5fb9024 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -95,7 +95,7 @@ module Launchpad
     if File.exist?(conf)
       token_hash = JSON.parse(File.read(conf), symbolize_names: true)
     else
-      consumer_options.merge(scheme: :header, site: 'https://api.launchpad.net')
+      consumer_options = consumer_options.merge(scheme: :header, site: 'https://api.launchpad.net')
       consumer = OAuth::Consumer.new('kubuntu-ci', '', consumer_options)
       request_token = consumer.get_request_token(oauth_callback: '')
       puts request_token.authorize_url(oauth_callback: '')

-- 
ci-tooling packaging