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

migrator: move around some migration logic.

Browse Source 
Move the checks for moving kegs to a new directory into the relevant
method (`move_to_new_directory`) instead. Also, delete duplicated
directories when we’ve confirmed they are definitely duplicated rather
than telling users to do so.
This commit is contained in:
Mike McQuaid 2017-03-29 11:21:31 +01:00
parent 5d1f4dd531
commit 1606e5db6f
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Library/Homebrew/migrator.rb
View File

@ -173,27 +173,12 @@ class Migrator
end end
def migrate def migrate
if old_cellar.exist? && new_cellar.exist?
conflicted = false
old_cellar.each_child do |c|
if (new_cellar/c.basename).exist?
conflicted = true
onoe "#{new_cellar/c.basename} already exists."
end
end
if conflicted
onoe "Remove #{new_cellar} manually and run brew migrate #{oldname}."
return
end
end
begin
oh1 "Migrating #{Formatter.identifier(oldname)} to #{Formatter.identifier(newname)}" oh1 "Migrating #{Formatter.identifier(oldname)} to #{Formatter.identifier(newname)}"
lock lock
unlink_oldname unlink_oldname
unlink_newname if new_cellar.exist? unlink_newname if new_cellar.exist?
move_to_new_directory
repin repin
move_to_new_directory
link_oldname_cellar link_oldname_cellar
link_oldname_opt link_oldname_opt
link_newname unless old_linked_keg.nil? link_newname unless old_linked_keg.nil?
@ -204,15 +189,34 @@ class Migrator
onoe "Error occurred while migrating." onoe "Error occurred while migrating."
puts e puts e
puts e.backtrace if ARGV.debug? puts e.backtrace if ARGV.debug?
puts "Backuping..." puts "Backing up..."
ignore_interrupts { backup_oldname } ignore_interrupts { backup_oldname }
ensure ensure
unlock unlock
end end
end
# move everything from Cellar/oldname to Cellar/newname # move everything from Cellar/oldname to Cellar/newname
def move_to_new_directory def move_to_new_directory
return unless old_cellar.exist?
if new_cellar.exist?
conflicted = false
old_cellar.each_child do |c|
next unless (new_cellar/c.basename).exist?
begin
FileUtils.rm_rf c
rescue Errno::EACCES
conflicted = true
onoe "#{new_cellar/c.basename} already exists."
end
end
if conflicted
onoe "Remove #{new_cellar} manually and run brew migrate #{oldname}."
return
end
end
puts "Moving to: #{new_cellar}" puts "Moving to: #{new_cellar}"
if new_cellar.exist? if new_cellar.exist?
FileUtils.mv(old_cellar.children, new_cellar) FileUtils.mv(old_cellar.children, new_cellar)