[DRE-commits] [bundler] 02/02: Remove upstream applied patch "revert-0d15cef"

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository bundler.

commit f5b564cbd6d09cb2f13c12e4f581bbea1dc70d52
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Fri Feb 7 20:27:48 2014 +0100

    Remove upstream applied patch "revert-0d15cef"
    
    Upstream agrees that this breaks various stuff, so they reverted the
    original commit.
---
 debian/patches/revert-0d15cef | 65 -------------------------------------------
 debian/patches/series         |  1 -
 2 files changed, 66 deletions(-)

diff --git a/debian/patches/revert-0d15cef b/debian/patches/revert-0d15cef
deleted file mode 100644
index 90bcb34..0000000
--- a/debian/patches/revert-0d15cef
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Revert upstream 0d15cefd0022136de663d6542f079268137c26f1
-  The upstream commit introduces a new requirement: Gems would actually
-  need to have their gem_full_path directory be present, or otherwise
-  bundler would not see them as installed. This is a problem for
-  system-provided gems, as they then fail to install.
-Author: Christian Hofstaedtler <zeha at debian.org>
-Last-Update: 2014-01-16
-
-Index: bundler/lib/bundler/source/rubygems.rb
-===================================================================
---- bundler.orig/lib/bundler/source/rubygems.rb	2014-01-06 01:43:11.287872406 +0100
-+++ bundler/lib/bundler/source/rubygems.rb	2014-01-16 16:04:37.393818609 +0100
-@@ -68,7 +68,7 @@ module Bundler
-       end
- 
-       def install(spec)
--        if installed_specs[spec].any? && gem_dir_exists?(spec)
-+        if installed_specs[spec].any?
-           return ["Using #{spec.name} (#{spec.version})", nil]
-         end
- 
-@@ -276,16 +276,6 @@ module Bundler
-           Bundler.rubygems.sources = old
-         end
-       end
--
--      def gem_dir_exists?(spec)
--        return true if spec.name == "bundler"
--        # Ruby 2 default gems
--        return true if spec.loaded_from.include?("specifications/default/")
--        # Ruby 1.9 default gems
--        return true if spec.summary =~ /is bundled with Ruby/
--
--        File.directory?(spec.full_gem_path)
--      end
-     end
- 
-   end
-Index: bundler/spec/install/gems/simple_case_spec.rb
-===================================================================
---- bundler.orig/spec/install/gems/simple_case_spec.rb	2013-12-27 11:49:31.514707011 +0100
-+++ bundler/spec/install/gems/simple_case_spec.rb	2014-01-16 16:03:57.814066818 +0100
-@@ -337,22 +337,6 @@ describe "bundle install with gem source
-       G
-       expect(exitstatus).to eq(0)
-     end
--
--    it "reinstalls the gem if the gem dir is missing but the specification file exists" do
--      gemfile(<<-G)
--        source "file://#{gem_repo1}"
--
--        gem 'foo'
--      G
--
--      bundle "install --path vendor/bundle"
--
--      FileUtils.rm_rf(vendored_gems('gems/foo-1.0'))
--
--      bundle "install"
--
--      expect(vendored_gems('gems/foo-1.0')).to exist
--    end
-   end
- 
-   describe "when Bundler root contains regex chars" do
diff --git a/debian/patches/series b/debian/patches/series
index 8ccd816..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-revert-0d15cef

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