diff options
| author | Rein Henrichs <reinh@reinh.com> | 2010-03-30 17:35:49 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | c014c297eb69fa856f17a0faa69d478a338e788b (patch) | |
| tree | d6b70e47ead723935b7b2e4318a6540968ba6495 | |
| parent | deff92d2bb830179fd68c42c02b193055b9b57be (diff) | |
| download | puppet-c014c297eb69fa856f17a0faa69d478a338e788b.tar.gz puppet-c014c297eb69fa856f17a0faa69d478a338e788b.tar.xz puppet-c014c297eb69fa856f17a0faa69d478a338e788b.zip | |
Renaming the old puppet executable
| -rw-r--r--[-rwxr-xr-x] | bin/main (renamed from bin/puppet) | 4 | ||||
| -rw-r--r-- | lib/puppet/application/main.rb (renamed from lib/puppet/application/puppet.rb) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/puppet b/bin/main index 931e3a993..542bf4095 100755..100644 --- a/bin/puppet +++ b/bin/main @@ -67,5 +67,5 @@ # Copyright (c) 2005 Reductive Labs, LLC # Licensed under the GNU Public License -require 'puppet/application/puppet' -Puppet::Application[:puppet].run +require 'puppet/application/main' +Puppet::Application[:main].run diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/main.rb index 2f7946b3d..faa317623 100644 --- a/lib/puppet/application/puppet.rb +++ b/lib/puppet/application/main.rb @@ -4,7 +4,7 @@ require 'puppet/configurer' require 'puppet/network/handler' require 'puppet/network/client' -Puppet::Application.new(:puppet) do +Puppet::Application.new(:main) do should_parse_config |