aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-07-05 17:30:41 -0500
committerJack Nagel2014-07-05 17:30:41 -0500
commit01dc9c4900b42d8d3556c316dbcb4a8597d8b7f4 (patch)
treeeeeb54c5e9870049a721607245dae5151c4018ed /Library
parent9a9328eef485e8321e1242b4a291215fde959198 (diff)
downloadbrew-01dc9c4900b42d8d3556c316dbcb4a8597d8b7f4.tar.bz2
brew-pull: rescue a specific exception
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/Contributions/cmd/brew-pull.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb
index f75174c73..45e1f8e50 100755
--- a/Library/Contributions/cmd/brew-pull.rb
+++ b/Library/Contributions/cmd/brew-pull.rb
@@ -73,7 +73,7 @@ ARGV.named.each do |arg|
begin
safe_system 'git', 'am', *patch_args
- rescue => e
+ rescue ErrorDuringExecution
system 'git', 'am', '--abort'
odie 'Patch failed to apply: aborted.'
end