Merge remote-tracking branch 'upstream/master'

constantcontact · Nov 11, 2014 · 7aed68c · 7aed68c
2 parents 6707ac4 + f21943b
commit 7aed68c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/jenkins_pipeline_builder/cli/helper.rb b/lib/jenkins_pipeline_builder/cli/helper.rb
@@ -44,7 +44,7 @@ def self.setup(options)
           (options[:password] || options[:password_base64])
           creds = options
         elsif options[:creds_file]
-          if creds_file.end_with? "json"
+          if options[:creds_file].end_with? "json"
             creds = JSON.parse(IO.read(File.expand_path(options[:creds_file])))
           else
             creds = YAML.load_file(File.expand_path(options[:creds_file]))