Rewrite conditions in more natural way

This commit is contained in:
Jack Nagel 2013-09-07 11:08:51 -05:00
parent 771a28427c
commit 4489a8684f

View File

@ -39,7 +39,7 @@ class FormulaInstaller
if f.installed? if f.installed?
msg = "#{f}-#{f.installed_version} already installed" msg = "#{f}-#{f.installed_version} already installed"
msg << ", it's just not linked" if not f.linked_keg.symlink? and not f.keg_only? msg << ", it's just not linked" unless f.linked_keg.symlink? or f.keg_only?
raise FormulaAlreadyInstalledError, msg raise FormulaAlreadyInstalledError, msg
end end
@ -314,7 +314,7 @@ class FormulaInstaller
end end
def caveats def caveats
if (not f.keg_only?) and ARGV.homebrew_developer? if ARGV.homebrew_developer? and not f.keg_only?
audit_bin audit_bin
audit_sbin audit_sbin
audit_lib audit_lib