diff options
| author | Markus Roberts <Markus@reality.com> | 2011-04-06 20:25:45 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2011-04-06 20:50:36 -0700 |
| commit | 1e4968e82a65b21ad5d075015830ef3f54efee05 (patch) | |
| tree | 23278e580116f7aa85281a1565fc771d60fc885f /lib/puppet/util | |
| parent | 99d78f2c15b6ccf543466d3fa2cdeda7eb3f9987 (diff) | |
| download | puppet-1e4968e82a65b21ad5d075015830ef3f54efee05.tar.gz puppet-1e4968e82a65b21ad5d075015830ef3f54efee05.tar.xz puppet-1e4968e82a65b21ad5d075015830ef3f54efee05.zip | |
(maint) Indentation fixes
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/command_line.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index fb56b2898..52b5f81ef 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -4,8 +4,7 @@ module Puppet module Util class CommandLine - LegacyName = Hash.new{|h,k| k}.update( - { + LegacyName = Hash.new{|h,k| k}.update( 'agent' => 'puppetd', 'cert' => 'puppetca', 'doc' => 'puppetdoc', @@ -15,9 +14,8 @@ module Puppet 'queue' => 'puppetqd', 'resource' => 'ralsh', 'kick' => 'puppetrun', - 'master' => 'puppetmasterd', - - }) + 'master' => 'puppetmasterd' + ) def initialize( zero = $0, argv = ARGV, stdin = STDIN ) @zero = zero @@ -68,14 +66,14 @@ module Puppet end def execute_external_subcommand - external_command = "puppet-#{subcommand_name}" + external_command = "puppet-#{subcommand_name}" - require 'puppet/util' - path_to_subcommand = Puppet::Util.which( external_command ) - return false unless path_to_subcommand + require 'puppet/util' + path_to_subcommand = Puppet::Util.which( external_command ) + return false unless path_to_subcommand - system( path_to_subcommand, *args ) - true + system( path_to_subcommand, *args ) + true end def legacy_executable_name |