File obs-server-2.7.1-0001-api-Use-bundler_ext-inste... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.7.1-0001-api-Use-bundler_ext-instead-of-bundler-if-Gemfile.in.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Currently displaying revision a54184d12a5b83bb4ed61fe52fa6ec1e , Show latest

From ba174e32f65636eee0d848c561d771f1c8f5e40c Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Sun, 18 May 2014 01:39:45 +0100
Subject: [PATCH 01/29] [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 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/api/config/application.rb b/src/api/config/application.rb
index a5886ff..c0111de 100644
--- a/src/api/config/application.rb
+++ b/src/api/config/application.rb
@@ -2,8 +2,14 @@ require File.expand_path('../boot', __FILE__)
 
 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
 
-- 
2.7.4

Places

File obs-server-2.7.1-0001-api-Use-bundler_ext-instead-of-bundler-if-Gemfile.in.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Places