From 115abd52b6bf6801dce7c3fbcb0e29d4213a5bb2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sun, 21 Nov 2010 02:47:20 +0100
Subject: Ensure that app generator is not loaded twice to get rid of warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/lib/rails/generators.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 27a4007c20..66c4088a68 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -302,6 +302,7 @@ module Rails
         $LOAD_PATH.each do |base|
           Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
             begin
+              path = path.sub("#{base}/", "")
               require path
             rescue Exception => e
               # No problem
-- 
cgit v1.2.3