From d2d7516cc04ec31f105eda64f87b79db316bcb2f Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 26 Dec 2014 19:42:11 -0500
Subject: [PATCH] Allow debugging patching failures

Closes Homebrew/homebrew#33056.
---
 Library/Homebrew/debrew.rb | 4 ++++
 Library/Homebrew/patch.rb  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/debrew.rb b/Library/Homebrew/debrew.rb
index dae4a9758f..eda533d56a 100644
--- a/Library/Homebrew/debrew.rb
+++ b/Library/Homebrew/debrew.rb
@@ -21,6 +21,10 @@ module Debrew
       Debrew.debrew { super }
     end
 
+    def patch
+      Debrew.debrew { super }
+    end
+
     def test
       Debrew.debrew { super }
     end
diff --git a/Library/Homebrew/patch.rb b/Library/Homebrew/patch.rb
index 2adb808f33..72deabefd9 100644
--- a/Library/Homebrew/patch.rb
+++ b/Library/Homebrew/patch.rb
@@ -128,7 +128,7 @@ class ExternalPatch
     resource.unpack do
       # Assumption: the only file in the staging directory is the patch
       patchfile = Pathname.pwd.children.first
-      safe_system "/usr/bin/patch", "-g", "0", "-f", "-d", dir, "-#{strip}", "-i", patchfile
+      dir.cd { safe_system "/usr/bin/patch", "-g", "0", "-f", "-#{strip}", "-i", patchfile }
     end
   end