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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 79922506a57448282b19878f89ac41463fb02328
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 13:42:36 2015 +0100

    add transitional token lookup for old tooling lineup
---
 lib/lp.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/lp.rb b/lib/lp.rb
index a0bfb10..d6f3a55 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -58,7 +58,12 @@ module Launchpad
     }
 
     token_hash = {}
+    # FIXME: this should be moved to a method one presumes.
     conf = "#{ENV['HOME']}/.config/lp-tokens.json"
+    unless File.exist?(conf)
+      conf = "#{ENV['HOME']}/tooling/confined/lp-tokens.json"
+      fail 'Could not find config file' unless File.exist?(conf)
+    end
     if File.exist?(conf)
       token_hash = JSON.parse(File.read(conf), symbolize_names: true)
     else
@@ -88,6 +93,10 @@ module Launchpad
 
     token_hash = {}
     conf = "#{ENV['HOME']}/.config/lp-tokens.json"
+    unless File.exist?(conf)
+      conf = "#{ENV['HOME']}/tooling/confined/lp-tokens.json"
+      fail 'Could not find config file' unless File.exist?(conf)
+    end
     if File.exist?(conf)
       token_hash = JSON.parse(File.read(conf), symbolize_names: true)
     else

-- 
ci-tooling packaging