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

formula_installer: fix syntax warning

Browse Source 
Library/Homebrew/formula_installer.rb:636: warning: shadowing outer local variable - conflict_file
Library/Homebrew/formula_installer.rb:636: warning: shadowing outer local variable - backup_file

Closes Homebrew/homebrew#43602.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-09-05 14:36:50 +08:00
parent db2552828b
commit f279a13977
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_installer.rb
View File

@ -583,7 +583,7 @@ class FormulaInstaller
keg.remove_linked_keg_record keg.remove_linked_keg_record
end end
link_overwrite_backup = {} # dict: conflict file -> backup file link_overwrite_backup = {} # Hash: conflict file -> backup file
backup_dir = HOMEBREW_CACHE/"Backup" backup_dir = HOMEBREW_CACHE/"Backup"
begin begin
@ -623,9 +623,9 @@ class FormulaInstaller
@show_summary_heading = true @show_summary_heading = true
ignore_interrupts do ignore_interrupts do
keg.unlink keg.unlink
link_overwrite_backup.each do |conflict_file, backup_file| link_overwrite_backup.each do |origin, backup|
conflict_file.parent.mkpath origin.parent.mkpath
backup_file.rename conflict_file backup.rename origin
end end
end end
Homebrew.failed = true Homebrew.failed = true