Merge pull request #2441 from MikeMcQuaid/install-handle-missing-receipt
Handle missing receipt on `brew install`.
This commit is contained in:
commit
a47c93fe2d
@ -194,8 +194,10 @@ module Homebrew
|
|||||||
next unless f.opt_prefix.directory?
|
next unless f.opt_prefix.directory?
|
||||||
keg = Keg.new(f.opt_prefix.resolved_path)
|
keg = Keg.new(f.opt_prefix.resolved_path)
|
||||||
tab = Tab.for_keg(keg)
|
tab = Tab.for_keg(keg)
|
||||||
tab.installed_on_request = true
|
unless tab.installed_on_request
|
||||||
tab.write
|
tab.installed_on_request = true
|
||||||
|
tab.write
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
perform_preinstall_checks
|
perform_preinstall_checks
|
||||||
|
|||||||
@ -100,11 +100,14 @@ class Tab < OpenStruct
|
|||||||
def self.for_keg(keg)
|
def self.for_keg(keg)
|
||||||
path = keg.join(FILENAME)
|
path = keg.join(FILENAME)
|
||||||
|
|
||||||
if path.exist?
|
tab = if path.exist?
|
||||||
from_file(path)
|
from_file(path)
|
||||||
else
|
else
|
||||||
empty
|
empty
|
||||||
end
|
end
|
||||||
|
|
||||||
|
tab["tabfile"] = path
|
||||||
|
tab
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns a tab for the named formula's installation,
|
# Returns a tab for the named formula's installation,
|
||||||
|
|||||||
@ -258,7 +258,7 @@ describe Tab do
|
|||||||
it "can create a Tab for a non-existant Keg" do
|
it "can create a Tab for a non-existant Keg" do
|
||||||
f.prefix.mkpath
|
f.prefix.mkpath
|
||||||
|
|
||||||
expect(subject.tabfile).to be nil
|
expect(subject.tabfile).to eq(f_tab_path)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user