diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-02-25 11:23:00 -0800 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-02-25 11:23:00 -0800 |
| commit | 063a55eda926ab77aad856a0948da1cb85d4aa7a (patch) | |
| tree | 84fe8127f609025e257dc511db3c01fb8e8a2633 | |
| parent | a42e796fa88574ef97a99b034c4229b961bdac60 (diff) | |
| parent | 439115e34c16be27549ee9aa122c418ae6992d76 (diff) | |
| download | puppet-063a55eda926ab77aad856a0948da1cb85d4aa7a.tar.gz puppet-063a55eda926ab77aad856a0948da1cb85d4aa7a.tar.xz puppet-063a55eda926ab77aad856a0948da1cb85d4aa7a.zip | |
Merge branch 'ticket/2.6.next/6499' into 2.6.next
| -rw-r--r-- | lib/puppet/util/command_line.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 4aff0a8cb..7f74d266a 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -85,7 +85,7 @@ module Puppet if zero == 'puppet' case argv.first when nil; [ stdin.tty? ? nil : "apply", argv] # ttys get usage info - when "--help"; [nil, argv] # help should give you usage, not the help for `puppet apply` + when "--help", "-h"; [nil, argv] # help should give you usage, not the help for `puppet apply` when /^-|\.pp$|\.rb$/; ["apply", argv] else [ argv.first, argv[1..-1] ] end |