Merge pull request #8135 from f9n/clean_up_the_knife_cookbook_upload_command

[knife] Remove duplicate code blocks in the knife cookbook upload command

1 files changed, 3 insertions, 17 deletions

diff --git a/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb
index 57a63c7b47..d2a140540e 100644
--- a/lib/chef/knife/cookbook_upload.rb
+++ b/lib/chef/knife/cookbook_upload.rb
@@ -76,22 +76,14 @@ class Chef
 
       def run
         # Sanity check before we load anything from the server
-        unless config[:all]
-          if @name_args.empty?
-            show_usage
-            ui.fatal("You must specify the --all flag or at least one cookbook name")
-            exit 1
-          end
-        end
-
-        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
-
-        if @name_args.empty? && ! config[:all]
+        if ! config[:all] && @name_args.empty?
           show_usage
           ui.fatal("You must specify the --all flag or at least one cookbook name")
           exit 1
         end
 
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
         assert_environment_valid!
         version_constraints_to_update = {}
         upload_failures = 0
@@ -121,12 +113,6 @@ class Chef
             ui.warn("Could not find any cookbooks in your cookbook path: #{cookbook_path}. Use --cookbook-path to specify the desired path.")
           end
         else
-          if @name_args.empty?
-            show_usage
-            ui.error("You must specify the --all flag or at least one cookbook name")
-            exit 1
-          end
-
           cookbooks_to_upload.each do |cookbook_name, cookbook|
             cookbook.freeze_version if config[:freeze]
             begin