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

2 files changed, 3 insertions, 3 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.
 
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
index 5ee60b959..38f9d8de1 100644
--- a/lib/puppet/util/log.rb
+++ b/lib/puppet/util/log.rb
@@ -167,7 +167,7 @@ class Puppet::Util::Log
             if Syslog.opened?
                 Syslog.close
             end
-            name = Puppet.name
+            name = Puppet.execname
             name = "puppet-#{name}" unless name =~ /puppet/
 
             options = Syslog::LOG_PID | Syslog::LOG_NDELAY