Fix another handful of warnings
This commit is contained in:
parent
8234ac22e9
commit
aa58a404ed
@ -11,7 +11,6 @@ module Homebrew extend self
|
|||||||
def bottle_formula f
|
def bottle_formula f
|
||||||
unless f.installed?
|
unless f.installed?
|
||||||
return ofail "Formula not installed: #{f.name}"
|
return ofail "Formula not installed: #{f.name}"
|
||||||
return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
unless built_as_bottle? f
|
unless built_as_bottle? f
|
||||||
|
@ -38,7 +38,7 @@ module Homebrew extend self
|
|||||||
raise FormulaUnavailableError, path.basename('.rb').to_s unless path.file?
|
raise FormulaUnavailableError, path.basename('.rb').to_s unless path.file?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
exec_editor *paths
|
exec_editor(*paths)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ module Homebrew extend self
|
|||||||
if ARGV.named.empty?
|
if ARGV.named.empty?
|
||||||
exec_browser HOMEBREW_WWW
|
exec_browser HOMEBREW_WWW
|
||||||
else
|
else
|
||||||
exec_browser *ARGV.formulae.map{ |f| f.homepage }
|
exec_browser(*ARGV.formulae.map(&:homepage))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -67,7 +67,7 @@ module Homebrew extend self
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
puts_capture.instance_eval &block
|
puts_capture.instance_eval(&block)
|
||||||
|
|
||||||
ensure
|
ensure
|
||||||
puts unless $did_puts
|
puts unless $did_puts
|
||||||
|
@ -12,7 +12,7 @@ module Homebrew extend self
|
|||||||
keg.unlink
|
keg.unlink
|
||||||
keg.uninstall
|
keg.uninstall
|
||||||
rm_opt_link keg.fname
|
rm_opt_link keg.fname
|
||||||
unpin keg.fname
|
rm_pin keg.fname
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@ -49,7 +49,7 @@ module Homebrew extend self
|
|||||||
optlink.unlink if optlink.symlink?
|
optlink.unlink if optlink.symlink?
|
||||||
end
|
end
|
||||||
|
|
||||||
def unpin name
|
def rm_pin name
|
||||||
Formula.factory(name).unpin rescue nil
|
Formula.factory(name).unpin rescue nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -246,6 +246,7 @@ class << ENV
|
|||||||
# This should be a safe hack to prevent that exception cropping up.
|
# This should be a safe hack to prevent that exception cropping up.
|
||||||
# Main consqeuence of this is that ENV['CFLAGS'] is never nil even when it
|
# Main consqeuence of this is that ENV['CFLAGS'] is never nil even when it
|
||||||
# is which can break if checks, but we don't do such a check in our code.
|
# is which can break if checks, but we don't do such a check in our code.
|
||||||
|
alias_method :"old_[]", :[]
|
||||||
def [] key
|
def [] key
|
||||||
if has_key? key
|
if has_key? key
|
||||||
fetch(key)
|
fetch(key)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user