From ca01b0ad97c5eccd82a249d640706eb623440837 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 4 Dec 2013 22:37:57 -0600 Subject: [PATCH] relocate_install_names: use a single ensure_writable block --- Library/Homebrew/keg_fix_install_names.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb index a7b49e5bcb..a4cf25978f 100644 --- a/Library/Homebrew/keg_fix_install_names.rb +++ b/Library/Homebrew/keg_fix_install_names.rb @@ -21,17 +21,15 @@ class Keg def relocate_install_names old_prefix, new_prefix, old_cellar, new_cellar, options={} mach_o_files.each do |file| - install_names_for(file, options, relocate_reject_proc(old_cellar)) do |id, old_cellar_names| - file.ensure_writable do + file.ensure_writable do + install_names_for(file, options, relocate_reject_proc(old_cellar)) do |id, old_cellar_names| old_cellar_names.each do |old_cellar_name| new_cellar_name = old_cellar_name.gsub(old_cellar, new_cellar) change_install_name(old_cellar_name, new_cellar_name, file) end end - end - install_names_for(file, options, relocate_reject_proc(old_prefix)) do |id, old_prefix_names| - file.ensure_writable do + install_names_for(file, options, relocate_reject_proc(old_prefix)) do |id, old_prefix_names| change_dylib_id(id.gsub(old_prefix, new_prefix), file) if file.dylib? old_prefix_names.each do |old_prefix_name|