From 951620f146fde045f106093fcd510a345a6fddd1 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 10 Jan 2013 15:57:21 -0600
Subject: [PATCH] Restore ARGV even if an exception is raised

---
 Library/Homebrew/extend/ARGV.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index b292f570bc..e409199aab 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -181,10 +181,9 @@ module HomebrewArgvExtension
     flags_to_clear.concat %w[--verbose -v] if quieter?
     flags_to_clear.each {|flag| delete flag}
 
-    ret = yield
-
-    replace old_args
-    ret
+    yield
+  ensure
+    replace(old_args)
   end
 
   private