Fix the logic for determining whether or not to use sudo

raggi · Aug 10, 2010 · bfdea45 · bfdea45
1 parent b6af5b0
commit bfdea45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -194,7 +194,7 @@ def requires_sudo?
       path = path.parent until path.exist?
       sudo_present = !`which sudo 2>#{NULL}`.empty?
 
-      !settings.path && !File.writable?(path) && sudo_present
+      settings.allow_sudo? && !File.writable?(path) && sudo_present
     end
 
     def mkdir_p(path)

diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
@@ -83,6 +83,10 @@ def path
       end
     end
 
+    def allow_sudo?
+      !@local_config.key?(key_for(:path))
+    end
+
   private
     def key_for(key)
       key = key.to_s.sub(".", "__").upcase