diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-15 16:43:27 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 71033786bf4abef4fd486793d6fe186fff87a432 (patch) | |
| tree | f7114c6c417b2bcce7e431b5018a5e0edff8df2d /bin | |
| parent | 54c1cc5dc9f8994378c850474b8fd468300fb0e8 (diff) | |
| download | puppet-71033786bf4abef4fd486793d6fe186fff87a432.tar.gz puppet-71033786bf4abef4fd486793d6fe186fff87a432.tar.xz puppet-71033786bf4abef4fd486793d6fe186fff87a432.zip | |
feature #2276 Single Executable: legacy settings
Puppet's defaults change depending on which command invokes them.
This patch makes sure that we use the maintain the current behavior.
This is a temporary fix until I implement feature #2935.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppet | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/puppet b/bin/puppet index 2f497c5fa..bf4ee3a95 100755 --- a/bin/puppet +++ b/bin/puppet @@ -8,13 +8,13 @@ usage = "Usage: puppet command <space separated arguments>" available = "Available commands are: #{builtins.sort.join(', ')}" require 'puppet/util/command_line' -command_line = Puppet::Util::CommandLine.shift_subcommand_from_argv +$puppet_subcommand_name = Puppet::Util::CommandLine.shift_subcommand_from_argv -if command_name.nil? +if $puppet_subcommand_name.nil? puts usage, available -elsif builtins.include?(command_name) #subcommand - require File.join(appdir, command_name) - Puppet::Application[command_name].run +elsif builtins.include?($puppet_subcommand_name) #subcommand + require File.join(appdir, $puppet_subcommand_name) + Puppet::Application[$puppet_subcommand_name].run else - abort "Error: Unknown command #{command_name}.\n#{usage}\n#{available}" + abort "Error: Unknown command #{$puppet_subcommand_name}.\n#{usage}\n#{available}" end |