diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-01 15:36:06 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-01 15:36:06 -0800 |
| commit | b140c415c39ddba46408d58b5a1bebd38ed38aba (patch) | |
| tree | 70c978fdaff1dd7387c3eb5a8907e0a638482751 | |
| parent | e2d2f7905706a0ba4aa547e22eb8895b52290a9c (diff) | |
| download | chef-lcg/pr-3778.tar.gz | |
additional ui.msg "" occuranceslcg/pr-3778
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | lib/chef/knife/cookbook_bulk_delete.rb | 6 | ||||
| -rw-r--r-- | lib/chef/knife/help.rb | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/knife/cookbook_bulk_delete.rb b/lib/chef/knife/cookbook_bulk_delete.rb index 374822b50b..c461cd9e6f 100644 --- a/lib/chef/knife/cookbook_bulk_delete.rb +++ b/lib/chef/knife/cookbook_bulk_delete.rb @@ -44,9 +44,9 @@ class Chef cookbooks_names = all_cookbooks.keys.grep(regex) cookbooks_to_delete = cookbooks_names.inject({}) { |hash, name| hash[name] = all_cookbooks[name]; hash } ui.msg "All versions of the following cookbooks will be deleted:" - ui.msg "" + ui.msg "\n" ui.msg ui.list(cookbooks_to_delete.keys.sort, :columns_down) - ui.msg "" + ui.msg "\n" unless config[:yes] ui.confirm("Do you really want to delete these cookbooks") @@ -55,7 +55,7 @@ class Chef ui.msg("Files that are common to multiple cookbooks are shared, so purging the files may break other cookbooks.") ui.confirm("Are you sure you want to purge files instead of just deleting the cookbooks") end - ui.msg "" + ui.msg "\n" end cookbooks_names.each do |cookbook_name| diff --git a/lib/chef/knife/help.rb b/lib/chef/knife/help.rb index 075bf4b310..5fdb661086 100644 --- a/lib/chef/knife/help.rb +++ b/lib/chef/knife/help.rb @@ -1,6 +1,6 @@ # # Author:: Daniel DeLeo (<dan@chef.io>) -# Copyright:: Copyright 2011-2016, Chef Software Inc. +# Copyright:: Copyright 2011-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,12 +25,12 @@ class Chef def run if name_args.empty? ui.info "Usage: knife SUBCOMMAND (options)" - ui.msg "" + ui.msg "\n" # This command is atypical, the user is likely not interested in usage of # this command, but knife in general. So hack the banner. opt_parser.banner = "General Knife Options:" ui.msg opt_parser.to_s - ui.msg "" + ui.msg "\n" ui.info "For further help:" ui.info(<<-MOAR_HELP) knife help list list help topics @@ -76,7 +76,7 @@ MOAR_HELP end if possibilities.empty? ui.error "No help found for '#{query}'" - ui.msg "" + ui.msg "\n" print_help_topics exit 1 elsif possibilities.size == 1 |