install: use Formula#full_name
This commit is contained in:
parent
4c323cdf34
commit
e8f888a23e
@ -42,35 +42,35 @@ module Homebrew
|
|||||||
# head-only without --HEAD is an error
|
# head-only without --HEAD is an error
|
||||||
if not ARGV.build_head? and f.stable.nil? and f.devel.nil?
|
if not ARGV.build_head? and f.stable.nil? and f.devel.nil?
|
||||||
raise <<-EOS.undent
|
raise <<-EOS.undent
|
||||||
#{f.name} is a head-only formula
|
#{f.full_name} is a head-only formula
|
||||||
Install with `brew install --HEAD #{f.name}`
|
Install with `brew install --HEAD #{f.full_name}`
|
||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
|
|
||||||
# devel-only without --devel is an error
|
# devel-only without --devel is an error
|
||||||
if not ARGV.build_devel? and f.stable.nil? and f.head.nil?
|
if not ARGV.build_devel? and f.stable.nil? and f.head.nil?
|
||||||
raise <<-EOS.undent
|
raise <<-EOS.undent
|
||||||
#{f.name} is a devel-only formula
|
#{f.full_name} is a devel-only formula
|
||||||
Install with `brew install --devel #{f.name}`
|
Install with `brew install --devel #{f.full_name}`
|
||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
|
|
||||||
if ARGV.build_stable? and f.stable.nil?
|
if ARGV.build_stable? and f.stable.nil?
|
||||||
raise "#{f.name} has no stable download, please choose --devel or --HEAD"
|
raise "#{f.full_name} has no stable download, please choose --devel or --HEAD"
|
||||||
end
|
end
|
||||||
|
|
||||||
# --HEAD, fail with no head defined
|
# --HEAD, fail with no head defined
|
||||||
if ARGV.build_head? and f.head.nil?
|
if ARGV.build_head? and f.head.nil?
|
||||||
raise "No head is defined for #{f.name}"
|
raise "No head is defined for #{f.full_name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# --devel, fail with no devel defined
|
# --devel, fail with no devel defined
|
||||||
if ARGV.build_devel? and f.devel.nil?
|
if ARGV.build_devel? and f.devel.nil?
|
||||||
raise "No devel block is defined for #{f.name}"
|
raise "No devel block is defined for #{f.full_name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
if f.installed?
|
if f.installed?
|
||||||
msg = "#{f.name}-#{f.installed_version} already installed"
|
msg = "#{f.full_name}-#{f.installed_version} already installed"
|
||||||
msg << ", it's just not linked" unless f.linked_keg.symlink? or f.keg_only?
|
msg << ", it's just not linked" unless f.linked_keg.symlink? or f.keg_only?
|
||||||
opoo msg
|
opoo msg
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user