Make sure we use the root Puppet class to avoid bad naming issues

ripienaar · Sep 16, 2010 · 78bf7ac · 78bf7ac
1 parent 0c05ee1
commit 78bf7ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/agent/package/puppet-package.rb b/agent/package/puppet-package.rb
@@ -34,11 +34,11 @@ def do_pkg_action(package, action)
                 begin
                     require 'puppet'
 
-                    if Puppet.version =~ /0.24/
-                        Puppet::Type.type(:package).clear
-                        pkg = Puppet::Type.type(:package).create(:name => package).provider
+                    if ::Puppet.version =~ /0.24/
+                        ::Puppet::Type.type(:package).clear
+                        pkg = ::Puppet::Type.type(:package).create(:name => package).provider
                     else
-                        pkg = Puppet::Type.type(:package).new(:name => package).provider
+                        pkg = ::Puppet::Type.type(:package).new(:name => package).provider
                     end
 
                     reply[:output] = ""

diff --git a/agent/service/puppet-service.rb b/agent/service/puppet-service.rb
@@ -41,11 +41,11 @@ def get_puppet(service)
 
                 require 'puppet'
 
-                if Puppet.version =~ /0.24/
-                    Puppet::Type.type(:service).clear
-                    svc = Puppet::Type.type(:service).create(:name => service, :hasstatus => hasstatus, :hasrestart => hasrestart).provider
+                if ::Puppet.version =~ /0.24/
+                    ::Puppet::Type.type(:service).clear
+                    svc = ::Puppet::Type.type(:service).create(:name => service, :hasstatus => hasstatus, :hasrestart => hasrestart).provider
                 else
-                    svc = Puppet::Type.type(:service).new(:name => service, :hasstatus => hasstatus, :hasrestart => hasrestart).provider
+                    svc = ::Puppet::Type.type(:service).new(:name => service, :hasstatus => hasstatus, :hasrestart => hasrestart).provider
                 end
 
                 svc