From 9cb7c149b749775e73f49f95fa0daf842dcbfe46 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Mon, 29 Aug 2016 14:31:03 -0500 Subject: [CompactIndexClient::Updater] Support weak etags (cherry picked from commit ece6829c46e4768aae13f970a54017c272bf974d) --- .../vendor/compact_index_client/lib/compact_index_client/updater.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb b/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb index 5c5ba41434..a410dd423c 100644 --- a/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb +++ b/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb @@ -50,7 +50,7 @@ class Bundler::CompactIndexClient mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w" local_temp_path.open(mode) {|f| f << content } - response_etag = response["ETag"] + response_etag = response["ETag"].gsub(%r{\AW/}, "") if etag_for(local_temp_path) == response_etag FileUtils.mv(local_temp_path, local_path) return -- cgit v1.2.1 From 0b3e891567772d18440cd8a819ec4a48187cf34d Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Mon, 10 Oct 2016 08:41:11 -0500 Subject: Version 1.13.3 with changelog --- CHANGELOG.md | 6 ++++++ lib/bundler/version.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c8cb54b90..e3c138be22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.13.3 (2016-10-10) + +Bugfixes: + + - add support for weak etags to the new index (@segiddins) + ## 1.13.2 (2016-09-30) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 5bfcfbf071..159148372e 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,5 +7,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.13.2" unless defined?(::Bundler::VERSION) + VERSION = "1.13.3" unless defined?(::Bundler::VERSION) end -- cgit v1.2.1