diff options
author | Frank Lam <ryzingsun11@yahoo.com> | 2020-06-02 08:59:53 +0800 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-06-18 19:14:15 +0900 |
commit | 0ba2f3e8a9ceee6561c2aa2116b37aeddf891a3e (patch) | |
tree | f8aa4a4e1490898829f25def48c445c6f7edfc9d /lib/bundler/cli/gem.rb | |
parent | 091daaa715e80a3964d7ddbcb53b40857d9399a8 (diff) | |
download | ruby-0ba2f3e8a9ceee6561c2aa2116b37aeddf891a3e.tar.gz |
[rubygems/rubygems] Move already configured --ci hint to before CI file creation
https://github.com/rubygems/rubygems/commit/2af2abe5fd
Diffstat (limited to 'lib/bundler/cli/gem.rb')
-rw-r--r-- | lib/bundler/cli/gem.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index e42077b428..edbc6d6216 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -193,12 +193,6 @@ module Bundler "so -t is not needed if you want to continue using it. " \ "This setting can be changed anytime with `bundle config gem.test`." end - - if options[:ci] == Bundler.settings["gem.ci"] - Bundler.ui.info "Bundler is configured to generate CI files for #{Bundler.settings["gem.ci"]}, "\ - "so --ci is not needed if you want to continue using it. " \ - "This setting can be changed anytime with `bundle config gem.ci`." - end rescue Errno::EEXIST => e raise GenericSystemCallError.new(e, "There was a conflict while creating the new gem.") end @@ -288,6 +282,10 @@ module Bundler Bundler.settings.set_global("gem.ci", ci_template) end + if options[:ci] == Bundler.settings["gem.ci"] + Bundler.ui.info "#{options[:ci]} is already configured, ignoring --ci flag." + end + ci_template end |