bundler-multilock 1.0.5 → 1.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bundler/multilock/version.rb +1 -1
- data/lib/bundler/multilock.rb +4 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4ac5957b4e60ef1153bb017f5fcfd90c255f349cfb734cf59203229f334f5681
|
|
4
|
+
data.tar.gz: d563a7ee8a4bafe90c045a91f96d43f8e0d14e3cb7b25240a2f2fc282640fc68
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b9b2ec93fb27705796664bfc22b0a78797bcc1ecf49d4f57708838907f78fe49b4130ca6be3a223b1a04ff590ef305418254647cff5c6d57f587aab633e378f7
|
|
7
|
+
data.tar.gz: 9426a93cddf07b541c65d02de0d439a30efc21e696499cc18213bd9bdbf6a2f170843547a1ae13bd6ae5b659371da2a2b0c6b1d8707f1b312be3f1e7ebd16021
|
data/lib/bundler/multilock.rb
CHANGED
|
@@ -85,10 +85,13 @@ module Bundler
|
|
|
85
85
|
defined?(CLI::Install) ||
|
|
86
86
|
defined?(CLI::Lock) ||
|
|
87
87
|
defined?(CLI::Update)) &&
|
|
88
|
-
!defined?(CLI::Cache)
|
|
88
|
+
!defined?(CLI::Cache) && !env_lockfile
|
|
89
89
|
# always use Gemfile.lock for `bundle check`, `bundle install`,
|
|
90
90
|
# `bundle lock`, and `bundle update`. `bundle cache` delegates to
|
|
91
91
|
# `bundle install`, but we want that to run as normal.
|
|
92
|
+
# If they're using BUNDLE_LOCKFILE, then they really do want to
|
|
93
|
+
# use a particular lockfile, and it overrides whatever they
|
|
94
|
+
# dynamically set in their gemfile
|
|
92
95
|
current = lockfile == Bundler.default_lockfile(force_original: true)
|
|
93
96
|
end
|
|
94
97
|
|