[DRE-commits] [SCM] ruby-railties-3.2.git branch, master, updated. debian/3.2.6-2-9-g4466df8

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 704062102502b2bc609b6b4134d743d9c38f0063
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jun 28 20:19:46 2012 -0300

    Fix patch format

diff --git a/debian/patches/be-carefull-with-that-bundler.patch b/debian/patches/be-carefull-with-that-bundler.patch
index 3c530ee..9ffa7ee 100644
--- a/debian/patches/be-carefull-with-that-bundler.patch
+++ b/debian/patches/be-carefull-with-that-bundler.patch
@@ -15,16 +15,16 @@ Author: Antonio Terceiro <terceiro at debian.org>
 
 --- ruby-railties-3.2-3.2.6.orig/lib/rails/generators/app_base.rb
 +++ ruby-railties-3.2-3.2.6/lib/rails/generators/app_base.rb
-@@ -240,22 +240,11 @@ module Rails
- 
+@@ -241,21 +241,11 @@ module Rails
        def bundle_command(command)
          say_status :run, "bundle #{command}"
--
+ 
 -        # We are going to shell out rather than invoking Bundler::CLI.new(command)
 -        # because `rails new` loads the Thor gem and on the other hand bundler uses
 -        # its own vendored Thor, which could be a different version. Running both
 -        # things in the same process is a recipe for a night with paracetamol.
--        #-        # We use backticks and #print here instead of vanilla #system because it
+-        #
+-        # We use backticks and #print here instead of vanilla #system because it
 -        # is easier to silence stdout in the existing test suite this way. The
 -        # end-user gets the bundler commands called anyway, so no big deal.
 -        #

-- 
ruby-railties-3.2.git