aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorMax Howell2012-03-07 13:48:04 +0000
committerMax Howell2012-03-07 13:48:04 +0000
commit8b04a82181d1b0d29b49db2b53d0f78bcf4dae1e (patch)
tree13b7ebc6d75999b96bb421c84b9525813c8a7e2d /Library/Homebrew/cmd
parent599cc70f39417b67b5902642f09dbba13ab42ace (diff)
downloadhomebrew-8b04a82181d1b0d29b49db2b53d0f78bcf4dae1e.tar.bz2
Allow dependencies to still install
Oops bug.
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/upgrade.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 215ae3d14..9777c5ce5 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -63,7 +63,7 @@ module Homebrew extend self
installer.install
installer.caveats
- installer.finish # includes link step
+ installer.finish
rescue CannotInstallFormulaError => e
onoe e
rescue BuildError => e
@@ -71,7 +71,7 @@ module Homebrew extend self
puts
ensure
# restore previous installation state if build failed
- outdated_keg.link if outdated_keg and not f.linked_keg.directory?
+ outdated_keg.link if outdated_keg and not f.installed? rescue nil
end
end