[DRE-commits] [bundler] 05/14: d/patches:do-not-add-system-path: refresh patch

[Samuel Henrique]

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

samueloph-guest pushed a commit to branch master
in repository bundler.

commit daba661180289f24b41100c14e075f9664183642
Author: Samuel Henrique <samueloph at gmail.com>
Date:   Thu Dec 28 20:14:28 2017 -0200

    d/patches:do-not-add-system-path: refresh patch
---
 debian/patches/do-not-add-system-path-to-RUBYLIB | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/patches/do-not-add-system-path-to-RUBYLIB b/debian/patches/do-not-add-system-path-to-RUBYLIB
index 77c2f0c..58bc1f8 100644
--- a/debian/patches/do-not-add-system-path-to-RUBYLIB
+++ b/debian/patches/do-not-add-system-path-to-RUBYLIB
@@ -14,9 +14,11 @@ Origin: vendor
  lib/bundler/shared_helpers.rb | 3 ---
  2 files changed, 9 deletions(-)
 
---- a/lib/bundler.rb
-+++ b/lib/bundler.rb
-@@ -270,12 +270,6 @@ EOF
+Index: bundler/lib/bundler.rb
+===================================================================
+--- bundler.orig/lib/bundler.rb
++++ bundler/lib/bundler.rb
+@@ -280,12 +280,6 @@ EOF
          env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
        end
  
@@ -29,15 +31,17 @@ Origin: vendor
        env
      end
  
---- a/lib/bundler/shared_helpers.rb
-+++ b/lib/bundler/shared_helpers.rb
-@@ -235,9 +235,6 @@ module Bundler
+Index: bundler/lib/bundler/shared_helpers.rb
+===================================================================
+--- bundler.orig/lib/bundler/shared_helpers.rb
++++ bundler/lib/bundler/shared_helpers.rb
+@@ -318,9 +318,6 @@ module Bundler
      end
  
      def set_rubylib
 -      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
 -      rubylib.unshift bundler_ruby_lib
--      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
+-      Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
      end
  
      def bundler_ruby_lib

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