Bugfixes for docker_registry dockercfg and login handling, fixes #114

sous-chefs · Apr 13, 2014 · 5233b43 · 5233b43
1 parent 6b1446a
commit 5233b43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -113,6 +113,8 @@ def dockercfg_parse
         dockercfg[k].merge!(dockercfg_parse_auth(v['auth']))
       end
       dockercfg
+    rescue
+      nil
     end
 
     def dockercfg_parse_auth(str)

diff --git a/providers/registry.rb b/providers/registry.rb
@@ -31,7 +31,7 @@ def command_timeout_error_message
 end
 
 def logged_in?
-  @current_resource.server
+  @current_resource.server ? true : false
 end
 
 def login