Package: rails / 2:6.0.3.5+dfsg-1

0001-Be-careful-with-that-bundler.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From: Antonio Terceiro <terceiro@debian.org>
Date: Thu, 3 Mar 2016 16:30:17 -0300
Subject: Be careful with that bundler

---
 railties/lib/rails/generators/app_base.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -367,7 +367,7 @@
       end
 
       def exec_bundle_command(bundle_command, command, env)
-        full_command = %Q["#{Gem.ruby}" "#{bundle_command}" #{command}]
+        full_command = %Q["#{Gem.ruby}" "#{bundle_command}" #{command}]
         if options[:quiet]
           system(env, full_command, out: File::NULL)
         else
@@ -404,7 +404,7 @@
       end
 
       def run_bundle
-        bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
+        bundle_command("install --local", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end
 
       def run_webpack
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1054,7 +1054,7 @@
       template
     end
 
-    sequence = ["git init", "install", "binstubs bundler", "exec spring binstub --all", "webpacker:install", "echo ran after_bundle"]
+    sequence = ["git init", "install --local", "binstubs bundler", "exec spring binstub --all", "webpacker:install", "echo ran after_bundle"]
     @sequence_step ||= 0
     ensure_bundler_first = -> command, options = nil do
       assert_equal sequence[@sequence_step], command, "commands should be called in sequence #{sequence}"