summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-09 14:14:14 +0200
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-09 14:18:01 +0200
commitb82ac556a501d9a0d5f8e536f9c87ee82e104294 (patch)
tree5c1bde88b90e0dcb2b4e5b6a51c7d5eeaa0d7e61
parentc57b53dd462271724f2d6249e3097af2acb857f4 (diff)
downloadbundler-b82ac556a501d9a0d5f8e536f9c87ee82e104294.tar.gz
Remove unneded condition
Because `bundler_2_mode?` is currently true for every supported mode.
-rw-r--r--lib/bundler/dsl.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 534c9b5537..b2ce09fd5e 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -450,11 +450,8 @@ repo_name ||= user_name
if Bundler.feature_flag.disable_multisource?
msg = "This Gemfile contains multiple primary sources. " \
"Each source after the first must include a block to indicate which gems " \
- "should come from that source"
- unless Bundler.feature_flag.bundler_2_mode?
- msg += ". To downgrade this error to a warning, run " \
- "`bundle config unset disable_multisource`"
- end
+ "should come from that source. To downgrade this error to a warning, run " \
+ "`bundle config unset disable_multisource`"
raise GemfileEvalError, msg
else
Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple primary sources. " \