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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 94860ba69b09cf7d8dc939897aef2166e682d50c
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Dec 9 13:58:59 2015 +0100

    do not scope consumer_options to avoid overriding the module function
---
 lib/lp.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/lp.rb b/lib/lp.rb
index d31f8b9..fc712b4 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -80,17 +80,17 @@ module Launchpad
     return nil unless token_hash
 
     site_options = { scheme: :header, site: 'https://api.launchpad.net' }
-    consumer_options = consumer_options.merge(site_options)
-    consumer = OAuth::Consumer.new('kubuntu-ci', '', consumer_options)
+    options = consumer_options.merge(site_options)
+    consumer = OAuth::Consumer.new('kubuntu-ci', '', options)
     @token = OAuth::AccessToken.from_hash(consumer, token_hash)
   end
 
   # @!visibility private
   # @note NOT thread safe
   def self.request_token
-    site_options = { scheme: :header, site: 'https://api.launchpad.net' }
-    consumer_options = consumer_options.merge(site_options)
-    consumer = OAuth::Consumer.new('kubuntu-ci', '', consumer_options)
+    site_options = { scheme: :header, site: 'https://launchpad.net' }
+    options = consumer_options.merge(site_options)
+    consumer = OAuth::Consumer.new('kubuntu-ci', '', options)
     request_token = consumer.get_request_token(oauth_callback: '')
     puts request_token.authorize_url(oauth_callback: '')
     loop do

-- 
ci-tooling packaging