From bb5022e7f729fb8b1ea4c18cc336a410abc7a905 Mon Sep 17 00:00:00 2001
From: evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Wed, 31 Oct 2007 23:32:32 +0000
Subject: Mongrel::Gems helper to deal with Rubygems and ActiveSupport
 infighting

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@852 19e92222-5c0b-0410-8929-a290d50e31e9
---
 lib/mongrel/command.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/mongrel/command.rb')

diff --git a/lib/mongrel/command.rb b/lib/mongrel/command.rb
index 64d2509..a3ee57d 100644
--- a/lib/mongrel/command.rb
+++ b/lib/mongrel/command.rb
@@ -7,11 +7,8 @@
 require 'singleton'
 require 'optparse'
 
-begin
-  require 'gem_plugin'
-rescue LoadError
-  require 'rubygems' and retry
-end
+require 'mongrel/gems'
+Mongrel::Gems.require 'gem_plugin'
 
 module Mongrel
 
-- 
cgit v1.2.3-24-ge0c7