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

Less code in begin block

Browse Source
This commit is contained in:
Jack Nagel 2014-10-20 17:07:54 -05:00
parent 55e0f40d02
commit 044393641e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/keg.rb
View File

@ -342,13 +342,17 @@ class Keg
end end
if stat.directory? if stat.directory?
keg = Keg.for(src) begin
keg = Keg.for(src)
rescue NotAKegError
puts "Won't resolve conflicts for symlink #{dst} as it doesn't resolve into the Cellar" if ARGV.verbose?
return
end
dst.unlink unless mode.dry_run dst.unlink unless mode.dry_run
keg.link_dir(src, mode) { :mkpath } keg.link_dir(src, mode) { :mkpath }
return true return true
end end
rescue NotAKegError
puts "Won't resolve conflicts for symlink #{dst} as it doesn't resolve into the Cellar" if ARGV.verbose?
end end
def make_relative_symlink dst, src, mode def make_relative_symlink dst, src, mode