Merge pull request #2193 from chastell/bugs/remove_warnings

Remove sources of two outstanding warnings
rubygems · Nov 30, 2012 · 3e583bd · 3e583bd
2 parents 22a6f54 + dc3e4f5
commit 3e583bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -230,7 +230,7 @@ def lock(file)
       end
 
       File.open(file, 'wb'){|f| f.puts(contents) }
-    rescue Errno::EACCES => e
+    rescue Errno::EACCES
       raise Bundler::InstallError,
         "There was an error while trying to write to Gemfile.lock. It is likely that \n" \
         "you need to allow write permissions for the file at path: \n" \

diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
@@ -513,6 +513,7 @@ def initialize(path, uri, ref, revision=nil, &allow)
           @allow    = allow || Proc.new { true }
         end
 
+        remove_method :revision if method_defined? :revision
         def revision
           @revision ||= allowed_in_path { git("rev-parse #{ref}").strip }
         end