admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

migrator: don't uninstall new_cellar if it existed

Browse Source 
Otherwise we could end up removing files unnecessarily.
This commit is contained in:
Mike McQuaid 2017-03-31 10:36:26 +01:00
parent 7d07d859ce
commit 9b4d57b6df
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/migrator.rb
View File

@ -77,6 +77,9 @@ class Migrator
# path to newname cellar according to new name # path to newname cellar according to new name
attr_reader :new_cellar attr_reader :new_cellar
# true if new cellar existed at initialization time
attr_reader :new_cellar_existed
# path to newname pin # path to newname pin
attr_reader :new_pin_record attr_reader :new_pin_record
@ -119,6 +122,7 @@ class Migrator
end end
@new_cellar = HOMEBREW_CELLAR/formula.name @new_cellar = HOMEBREW_CELLAR/formula.name
@new_cellar_existed = @new_cellar.exist?
if @old_linked_keg = linked_old_linked_keg if @old_linked_keg = linked_old_linked_keg
@old_linked_keg_record = old_linked_keg.linked_keg_record if old_linked_keg.linked? @old_linked_keg_record = old_linked_keg.linked_keg_record if old_linked_keg.linked?
@ -368,7 +372,7 @@ class Migrator
new_cellar.subdirs.each do |d| new_cellar.subdirs.each do |d|
newname_keg = Keg.new(d) newname_keg = Keg.new(d)
newname_keg.unlink newname_keg.unlink
newname_keg.uninstall newname_keg.uninstall if new_cellar_existed
end end
end end