From 044393641e5e5b72ebe117ddb9b3b5eb21f05479 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Mon, 20 Oct 2014 17:07:54 -0500
Subject: [PATCH] Less code in begin block
---
Library/Homebrew/keg.rb | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 0cf6e122e7..c657074c87 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -342,13 +342,17 @@ class Keg
end
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
keg.link_dir(src, mode) { :mkpath }
return true
end
- rescue NotAKegError
- puts "Won't resolve conflicts for symlink #{dst} as it doesn't resolve into the Cellar" if ARGV.verbose?
end
def make_relative_symlink dst, src, mode
--
GitLab