Log In
Log In
Places
All Projects
Status Monitor
Collapse sidebar
obs:server:fedora:2.8:testing
obs-server
obs-server-2.8-0001-api-Use-bundler_ext-instead...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File obs-server-2.8-0001-api-Use-bundler_ext-instead-of-bundler-if-Gemfile.in.patch of Package obs-server
From 3b3fa121749fb20d48a44c3bb4d700d22eb6a7ce Mon Sep 17 00:00:00 2001 From: Oleg Girko <ol@infoserver.lv> Date: Sun, 18 May 2014 01:39:45 +0100 Subject: [PATCH] [api] Use bundler_ext instead of bundler if Gemfile.in file present. This is needed for installations where Ruby gems are managed by system package manager (like RPM or APT), so bundler should not interfere with that and refuse to start application if gems with versions slightly different than ones mentioned in Gemfile.lock are installed in the system. Signed-off-by: Oleg Girko <ol@infoserver.lv> --- src/api/config/application.rb | 10 ++++++++-- src/api/config/boot.rb | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/api/config/application.rb b/src/api/config/application.rb index a77d48d..2b16902 100644 --- a/src/api/config/application.rb +++ b/src/api/config/application.rb @@ -2,8 +2,14 @@ require_relative 'boot' require 'rails/all' -# Assets should be precompiled for production (so we don't need the gems loaded then) -Bundler.require(*Rails.groups(assets: %w(development test))) +gemfile_in = File.expand_path('../../Gemfile.in', __FILE__) +if File.exist?(gemfile_in) + require 'bundler_ext' + BundlerExt.system_require(gemfile_in, *Rails.groups(assets: %w(development test))) +else + # Assets should be precompiled for production (so we don't need the gems loaded then) + Bundler.require(*Rails.groups(assets: %w(development test))) +end require_relative '../lib/engines/base.rb' OBSEngine::load_engines diff --git a/src/api/config/boot.rb b/src/api/config/boot.rb index 30f5120..b65f6ef 100644 --- a/src/api/config/boot.rb +++ b/src/api/config/boot.rb @@ -1,3 +1,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) -require 'bundler/setup' # Set up gems listed in the Gemfile. +# Set up gems listed in the Gemfile. +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) -- 2.9.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Contact
Support
@OBShq
The Open Build Service is an
openSUSE project
.
Log In
Places
Places
All Projects
Status Monitor