From ed1e07837a08327c637b51c573bda72944f45daf Mon Sep 17 00:00:00 2001
From: unknown <ericp@.(none)>
Date: Thu, 9 Jul 2009 11:06:25 -0700
Subject: [PATCH] Load ruby-debug only if there's no current Debugger module

---
 actionpack/test/abstract_unit.rb |    2 +-
 railties/lib/test_help.rb        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 30e795a..66e07e0 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -29,7 +29,7 @@ begin
   Debugger.start
 rescue LoadError
   # Debugging disabled. `gem install ruby-debug` to enable.
-end
+end unless defined? Debugger
 
 ActiveSupport::Dependencies.hook!
 
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 4318203..01adcde 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -36,4 +36,4 @@ begin
   end
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
-end
+end unless defined? Debugger
-- 
1.5.6.1.1071.g76fb