diff options
| author | shadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-16 23:14:51 +0000 |
|---|---|---|
| committer | shadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-16 23:14:51 +0000 |
| commit | 0aa3b6683a37cee2a24dd8050e8242efe50856d5 (patch) | |
| tree | 1f1530a0a4bbbd55f23cd7b54921bb378d937b48 /lib/puppet/util/config.rb | |
| parent | 6555dadc51feaa58b3dcebc74e2c426a64353395 (diff) | |
| download | puppet-0aa3b6683a37cee2a24dd8050e8242efe50856d5.tar.gz puppet-0aa3b6683a37cee2a24dd8050e8242efe50856d5.tar.xz puppet-0aa3b6683a37cee2a24dd8050e8242efe50856d5.zip | |
Change Puppet.name to Puppet.execname so rails 1.2 won't freak out.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2202 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/util/config.rb')
| -rw-r--r-- | lib/puppet/util/config.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/config.rb b/lib/puppet/util/config.rb index b94b84051..117f87f92 100644 --- a/lib/puppet/util/config.rb +++ b/lib/puppet/util/config.rb @@ -301,7 +301,7 @@ class Puppet::Util::Config # the group can be set in the config file. The problem # is that we're using the word 'group' twice, which is # confusing. - if var == :group and section == Puppet.name and @config.include?(:group) + if var == :group and section == Puppet.execname and @config.include?(:group) @config[:group].value = value end next @@ -519,7 +519,7 @@ class Puppet::Util::Config # Convert our list of objects into a configuration file. def to_config - str = %{The configuration file for #{Puppet.name}. Note that this file + str = %{The configuration file for #{Puppet.execname}. Note that this file is likely to have unused configuration parameters in it; any parameter that's valid anywhere in Puppet can be in any config file, even if it's not used. |