[DRE-commits] [bundler] 02/03: Do not add system path to RUBYLIB

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository bundler.

commit f01f666824f942950dbe14564515bed35daa34cc
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Jul 13 15:55:19 2016 +0000

    Do not add system path to RUBYLIB
    
    Bundler adds it's own installation path in front of RUBYLIB, but when
    this is the system ruby path, this causes system-wide installed gems
    to be used before bundler-installed gems.
    
    Closes: #830958
    Forwarded: not-needed
    Git-Dch: full
    Thanks: Gabriel Corona
---
 debian/patches/do-not-add-system-path-to-RUBYLIB | 47 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 48 insertions(+)

diff --git a/debian/patches/do-not-add-system-path-to-RUBYLIB b/debian/patches/do-not-add-system-path-to-RUBYLIB
new file mode 100644
index 0000000..6d71f0e
--- /dev/null
+++ b/debian/patches/do-not-add-system-path-to-RUBYLIB
@@ -0,0 +1,47 @@
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Wed, 13 Jul 2016 15:51:52 +0000
+Subject: Do not add system path to RUBYLIB
+
+Bundler adds it's own installation path in front of RUBYLIB, but when
+this is the system ruby path, this causes system-wide installed gems
+to be used before bundler-installed gems.
+
+Closes: #830958
+Forwarded: not-needed
+Origin: vendor
+---
+ lib/bundler.rb                | 6 ------
+ lib/bundler/shared_helpers.rb | 3 ---
+ 2 files changed, 9 deletions(-)
+
+diff --git a/lib/bundler.rb b/lib/bundler.rb
+index dcb151b..138f38a 100644
+--- a/lib/bundler.rb
++++ b/lib/bundler.rb
+@@ -220,12 +220,6 @@ module Bundler
+         env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
+       end
+ 
+-      if env.key?("RUBYLIB")
+-        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
+-        rubylib.delete(File.expand_path("..", __FILE__))
+-        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
+-      end
+-
+       env
+     end
+ 
+diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
+index c79c88c..6b77105 100644
+--- a/lib/bundler/shared_helpers.rb
++++ b/lib/bundler/shared_helpers.rb
+@@ -183,9 +183,6 @@ module Bundler
+     end
+ 
+     def set_rubylib
+-      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
+-      rubylib.unshift File.expand_path("../..", __FILE__)
+-      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
+     end
+ 
+     def clean_load_path
diff --git a/debian/patches/series b/debian/patches/series
index a10e431..7dac214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no-git-in-gemspec
 unvendorize
 0002-Mark-molinillo-methods-as-public.patch
+do-not-add-system-path-to-RUBYLIB

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git