summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Szotkowski <chastell@chastell.net>2012-12-01 00:23:32 +0100
committerPiotr Szotkowski <chastell@chastell.net>2012-12-01 00:23:39 +0100
commitdc3e4f52e09bfdcda35f478ad7268cf7dd9fe4ff (patch)
treed5d1d13a659581fde9ebcf06f140f8075f9fba84
parent22a6f54e12655c50df33300efca3840e9c88d5b5 (diff)
downloadbundler-dc3e4f52e09bfdcda35f478ad7268cf7dd9fe4ff.tar.gz
remove sources of two outstanding warnings
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--lib/bundler/source.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 98508a60ac..dee58665fc 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -230,7 +230,7 @@ module Bundler
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
index 4f2ce4e7b1..11fe0b587b 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -513,6 +513,7 @@ module Bundler
@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