]> git.pld-linux.org Git - packages/passenger.git/blob - no-bundler.patch
- disble duplicate bundler run (rails does it on package creation)
[packages/passenger.git] / no-bundler.patch
1 --- passenger-release-4.0.50/lib/phusion_passenger/loader_shared_helpers.rb~    2014-08-26 16:15:57.000000000 +0200
2 +++ passenger-release-4.0.50/lib/phusion_passenger/loader_shared_helpers.rb     2014-09-05 08:19:31.449268337 +0200
3 @@ -230,38 +230,6 @@
4                 # The app developer may also override our strategy with this magic file.
5                 elsif File.exist?('config/setup_load_paths.rb')
6                         require File.expand_path('config/setup_load_paths')
7 -
8 -               # Older versions of Bundler use .bundle/environment.rb as the Bundler
9 -               # environment lock file. This has been replaced by Gemfile.lock in later
10 -               # versions, but we still support the older mechanism.
11 -               # If the Bundler environment lock file exists then load that. If it
12 -               # exists then there's a 99.9% chance that loading it is the correct
13 -               # thing to do.
14 -               elsif File.exist?('.bundle/environment.rb')
15 -                       running_bundler(options) do
16 -                               require File.expand_path('.bundle/environment')
17 -                       end
18 -
19 -               # If the legacy Bundler environment file doesn't exist then there are two
20 -               # possibilities:
21 -               # 1. Bundler is not used, in which case we don't have to do anything.
22 -               # 2. Bundler *is* used, but either the user is using a newer Bundler versions,
23 -               #    or the gems are not locked. In either case, we're supposed to call
24 -               #    Bundler.setup.
25 -               #
26 -               # The existence of Gemfile indicates whether (2) is true:
27 -               elsif File.exist?('Gemfile')
28 -                       # In case of Rails 3, config/boot.rb already calls Bundler.setup.
29 -                       # However older versions of Rails may not so loading boot.rb might
30 -                       # not be the correct thing to do. To be on the safe side we
31 -                       # call Bundler.setup ourselves; calling Bundler.setup twice is
32 -                       # harmless. If this isn't the correct thing to do after all then
33 -                       # there's always the load_path_setup_file option and
34 -                       # setup_load_paths.rb.
35 -                       running_bundler(options) do
36 -                               require 'rubygems'
37 -                               require 'bundler/setup'
38 -                       end
39                 end
40  
41  
This page took 0.036762 seconds and 3 git commands to generate.