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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 6a080afaa729e86bda10d7dc7332a9093fd30528
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 14:20:48 2015 +0100

    do not fail when a conf file could not be found
    
    in terms of authenticate this is silly anyway as we then authenticate
    and in terms of the token getter it's a bit of a temporary problem. ideally
    it should fail to make sure one doesn't run commands without authenticate
    for backwards compatibility we can't though
    mehmeh.
---
 lib/lp.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/lp.rb b/lib/lp.rb
index d6f3a55..f8ab79d 100644
--- a/lib/lp.rb
+++ b/lib/lp.rb
@@ -62,7 +62,6 @@ module Launchpad
     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)
@@ -95,7 +94,6 @@ module Launchpad
     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)

-- 
ci-tooling packaging