summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-08-05 07:54:09 +0900
committerHomu <homu@barosl.com>2016-08-05 07:54:09 +0900
commite23ea1519cfd9164053cb0eca84c3447ed6a2d57 (patch)
treee8d7b000ef91fdef747ca169bf6f17afa6503ac6 /lib
parentc5e902f912abc505ccc34870747bd7396844723b (diff)
parent004585f9dd099f6ed97c070a78512606a697bf1a (diff)
downloadbundler-e23ea1519cfd9164053cb0eca84c3447ed6a2d57.tar.gz
Auto merge of #4839 - bundler:seg-travis-output, r=indirect
Clean up spec output on Travis
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/fetcher/compact_index.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/bundler/fetcher/compact_index.rb b/lib/bundler/fetcher/compact_index.rb
index be5683dbbd..b51ba150a9 100644
--- a/lib/bundler/fetcher/compact_index.rb
+++ b/lib/bundler/fetcher/compact_index.rb
@@ -97,13 +97,12 @@ module Bundler
end
def bundle_worker(func = nil)
- if @bundle_worker
- @bundle_worker.tap do |worker|
- worker.instance_variable_set(:@func, func) if func
- end
- else
+ @bundle_worker ||= begin
worker_name = "Compact Index (#{display_uri.host})"
- @bundle_worker ||= Bundler::Worker.new(25, worker_name, func)
+ Bundler::Worker.new(25, worker_name, func)
+ end
+ @bundle_worker.tap do |worker|
+ worker.instance_variable_set(:@func, func) if func
end
end