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

Merge pull request #7958 from Bo98/mv

Browse Source 
formula_installer: mv rather than rename on link_overwrite
This commit is contained in:
Bo Anderson 2020-07-09 15:34:36 +01:00 committed by GitHub
commit 17ddfe102b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -857,7 +857,7 @@ class FormulaInstaller
if formula.link_overwrite?(conflict_file) && !link_overwrite_backup.key?(conflict_file) if formula.link_overwrite?(conflict_file) && !link_overwrite_backup.key?(conflict_file)
backup_file = backup_dir/conflict_file.relative_path_from(HOMEBREW_PREFIX).to_s backup_file = backup_dir/conflict_file.relative_path_from(HOMEBREW_PREFIX).to_s
backup_file.parent.mkpath backup_file.parent.mkpath
conflict_file.rename backup_file FileUtils.mv conflict_file, backup_file
link_overwrite_backup[conflict_file] = backup_file link_overwrite_backup[conflict_file] = backup_file
retry retry
end end
@ -889,7 +889,7 @@ class FormulaInstaller
keg.unlink keg.unlink
link_overwrite_backup.each do |origin, backup| link_overwrite_backup.each do |origin, backup|
origin.parent.mkpath origin.parent.mkpath
backup.rename origin FileUtils.mv backup, origin
end end
end end
Homebrew.failed = true Homebrew.failed = true