summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-04-21 00:37:15 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitb0737228b8b56019e417d68d7215270ce282f535 (patch)
tree3578f38fa93d7167fba752ab87fbfd1357bb405c /lib/puppet
parentbfad735335bfd65d48b14af2998bd4ce2d86ab96 (diff)
downloadpuppet-b0737228b8b56019e417d68d7215270ce282f535.tar.gz
puppet-b0737228b8b56019e417d68d7215270ce282f535.tar.xz
puppet-b0737228b8b56019e417d68d7215270ce282f535.zip
feature #2276 Single Executable: help for apply
restore the help text for the apply command Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/command_line.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index ba474df91..f231ee7f8 100644
--- a/lib/puppet/util/command_line.rb
+++ b/lib/puppet/util/command_line.rb
@@ -4,6 +4,7 @@ module Puppet
def self.shift_subcommand_from_argv( argv = ARGV, stdin = STDIN )
case argv.first
when nil; "apply" unless stdin.tty? # ttys get usage info
+ when "--help"; nil # help should give you usage, not the help for `puppet apply`
when /^-|\.pp$|\.rb$/; "apply"
else argv.shift
end