diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-06-14 13:11:22 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-06-23 19:40:12 -0500 |
| commit | 1e23246902f950a3fa4132d2effaea47c723d51c (patch) | |
| tree | 550b62eafceddcc622d360526c1df5d874f924b7 | |
| parent | 9c8dab3c0e9078637edd50049bdc2351d6d27458 (diff) | |
| download | bundler-1e23246902f950a3fa4132d2effaea47c723d51c.tar.gz | |
Disable mutisource gemfiles by default on 2.0
| -rw-r--r-- | lib/bundler/dsl.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/feature_flag.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 665724f54d..72e2f761bb 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -432,8 +432,7 @@ repo_name ||= user_name def check_primary_source_safety(source) return unless source.rubygems_primary_remotes.any? - # TODO: 2.0 upgrade from setting to default - if Bundler.settings[:disable_multisource] + if Bundler.feature_flag.disable_multisource? raise GemfileError, "Warning: this Gemfile contains multiple primary sources. " \ "Each source after the first must include a block to indicate which gems " \ "should come from that source. To downgrade this error to a warning, run " \ diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 423e98ba65..fe0c1c9770 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -28,6 +28,7 @@ module Bundler settings_flag(:allow_bundler_dependency_conflicts) { bundler_2_mode? } settings_flag(:allow_offline_install) { bundler_2_mode? } + settings_flag(:disable_multisource) { bundler_2_mode? } settings_flag(:error_on_stderr) { bundler_2_mode? } settings_flag(:init_gems_rb) { bundler_2_mode? } settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? } diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index f4dd28d376..66cb785137 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -15,6 +15,7 @@ module Bundler disable_checksum_validation disable_exec_load disable_local_branch_check + disable_multisource disable_shared_gems disable_version_check error_on_stderr |