aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/keg_fix_install_names.rb
diff options
context:
space:
mode:
authorJack Nagel2013-12-04 22:37:57 -0600
committerJack Nagel2013-12-04 22:37:57 -0600
commit557bd6554604b142705a7df7db0353733906b829 (patch)
tree86619ec6d6828a52f79bb5b1aa0dfb21203e1aaf /Library/Homebrew/keg_fix_install_names.rb
parent23856ec545b2c461c194003cfe7f50167bc0b44e (diff)
downloadhomebrew-557bd6554604b142705a7df7db0353733906b829.tar.bz2
relocate_install_names: use a single ensure_writable block
Diffstat (limited to 'Library/Homebrew/keg_fix_install_names.rb')
-rw-r--r--Library/Homebrew/keg_fix_install_names.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb
index a7b49e5bc..a4cf25978 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|