refactor knife arg validation for clarity

1 files changed, 5 insertions, 4 deletions

diff --git a/chef/lib/chef/application/knife.rb b/chef/lib/chef/application/knife.rb
index 4fd89066bd..bfd5fd15b3 100644
--- a/chef/lib/chef/application/knife.rb
+++ b/chef/lib/chef/application/knife.rb
@@ -125,11 +125,12 @@ class Chef::Application::Knife < Chef::Application
     # Checking ARGV validity *before* parse_options because parse_options
     # mangles ARGV in some situations
     if no_subcommand_given?
-      print_help_and_exit if want_help?
-      print_help_and_exit if want_version?
-      print_help_and_exit(2, "Sorry, you need to pass a sub-command first!")
+      if (want_help? || want_version?)
+        print_help_and_exit
+      else
+        print_help_and_exit(2, "Sorry, you need to pass a sub-command first!")
+      end
     end
-    print_help_and_exit if no_command_given?
   end
   
   def no_subcommand_given?