From 1d23013abf9e8db5aa405c87ac6657df3f050926 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Wed, 9 May 2007 23:08:42 +0000
Subject: Fixing #605 -- providers now refer to @resource or @resource_type.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2501 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/provider/package/apple.rb      |  6 +++---
 lib/puppet/provider/package/apt.rb        | 18 +++++++++---------
 lib/puppet/provider/package/aptitude.rb   |  2 +-
 lib/puppet/provider/package/aptrpm.rb     | 10 +++++-----
 lib/puppet/provider/package/blastwave.rb  | 10 +++++-----
 lib/puppet/provider/package/darwinport.rb | 12 ++++++------
 lib/puppet/provider/package/dpkg.rb       | 12 ++++++------
 lib/puppet/provider/package/freebsd.rb    | 10 +++++-----
 lib/puppet/provider/package/gem.rb        | 14 +++++++-------
 lib/puppet/provider/package/openbsd.rb    | 12 ++++++------
 lib/puppet/provider/package/pkgdmg.rb     |  8 ++++----
 lib/puppet/provider/package/portage.rb    | 10 +++++-----
 lib/puppet/provider/package/ports.rb      | 10 +++++-----
 lib/puppet/provider/package/rpm.rb        | 18 +++++++++---------
 lib/puppet/provider/package/rug.rb        |  8 ++++----
 lib/puppet/provider/package/sun.rb        | 26 +++++++++++++-------------
 lib/puppet/provider/package/up2date.rb    |  6 +++---
 lib/puppet/provider/package/yum.rb        | 14 +++++++-------
 18 files changed, 103 insertions(+), 103 deletions(-)

(limited to 'lib/puppet/provider/package')

diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb
index e34820b55..ce845670f 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -33,8 +33,8 @@ Puppet::Type.type(:package).provide :apple do
     end
 
     def query
-        if FileTest.exists?("/Library/Receipts/#{@model[:name]}.pkg")
-            return {:name => @model[:name], :ensure => :present}
+        if FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg")
+            return {:name => @resource[:name], :ensure => :present}
         else
             return nil
         end
@@ -42,7 +42,7 @@ Puppet::Type.type(:package).provide :apple do
 
     def install
         source = nil
-        unless source = @model[:source]
+        unless source = @resource[:source]
             self.fail "Mac OS X packages must specify a package source"
         end
 
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index 034a406f1..81b7c9a12 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -31,7 +31,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
             end
         end
 
-        if @@checkedforcdrom and @model[:allowcdrom] != :true
+        if @@checkedforcdrom and @resource[:allowcdrom] != :true
             raise Puppet::Error,
                 "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
         end
@@ -40,14 +40,14 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
     def install
-        if @model[:responsefile]
+        if @resource[:responsefile]
             self.run_preseed
         end
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
         checkforcdrom()
 
-        str = @model[:name]
+        str = @resource[:name]
         case should
         when true, false, Symbol
             # pass
@@ -58,7 +58,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
         cmd = %w{-q -y}
 
         keep = ""
-        if config = @model[:configfiles]
+        if config = @resource[:configfiles]
             case config
             when :keep
                 cmd << "-o" << 'DPkg::Options::=--force-confold'
@@ -76,7 +76,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
 
     # What's the latest package version available?
     def latest
-        output = aptcache :policy,  @model[:name]
+        output = aptcache :policy,  @resource[:name]
 
         if output =~ /Candidate:\s+(\S+)\s/
             return $1
@@ -90,7 +90,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
 	# preseeds answers to dpkg-set-selection from the "responsefile"
 	#
     def run_preseed
-        if response = @model[:responsefile] and FileTest.exists?(response)
+        if response = @resource[:responsefile] and FileTest.exists?(response)
             self.info("Preseeding %s to debconf-set-selections" % response)
 
             preseed response
@@ -104,11 +104,11 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     end
 
     def uninstall
-        aptget "-y", "-q", :remove, @model[:name]
+        aptget "-y", "-q", :remove, @resource[:name]
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @model[:name]
+        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
      end
 
     def versionable?
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index c4f8023d2..32dd37627 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -23,7 +23,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
     end
 
     def purge
-        aptitude '-y', 'purge', @model[:name]
+        aptitude '-y', 'purge', @resource[:name]
 	end
 end
 
diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb
index 919236365..89a309857 100644
--- a/lib/puppet/provider/package/aptrpm.rb
+++ b/lib/puppet/provider/package/aptrpm.rb
@@ -11,9 +11,9 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        str = @model[:name]
+        str = @resource[:name]
         case should
         when true, false, Symbol
             # pass
@@ -30,7 +30,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
 
     # What's the latest package version available?
     def latest
-        output = aptcache :showpkg,  @model[:name]
+        output = aptcache :showpkg,  @resource[:name]
 
         if output =~ /Versions:\s*\n((\n|.)+)^$/
             versions = $1
@@ -64,11 +64,11 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm do
     end
 
     def uninstall
-        aptget "-y", "-q", 'remove', @model[:name]
+        aptget "-y", "-q", 'remove', @resource[:name]
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @model[:name]
+        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
      end
 
     def versionable?
diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb
index e8a925b2c..9f544dbd5 100755
--- a/lib/puppet/provider/package/blastwave.rb
+++ b/lib/puppet/provider/package/blastwave.rb
@@ -86,28 +86,28 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun do
     end
 
     def install
-        pkgget "-f", :install, @model[:name]
+        pkgget "-f", :install, @resource[:name]
     end
 
     # Retrieve the version from the current package file.
     def latest
-        hash = self.class.blastlist(:justme => @model[:name])
+        hash = self.class.blastlist(:justme => @resource[:name])
         hash[:avail]
     end
 
     def query
-        hash = self.class.blastlist(:justme => @model[:name])
+        hash = self.class.blastlist(:justme => @resource[:name])
 
         {:ensure => hash[:ensure]}
     end
 
     # Remove the old package, and install the new one
     def update
-        pkgget "-f", :upgrade, @model[:name]
+        pkgget "-f", :upgrade, @resource[:name]
     end
 
     def uninstall
-        pkgget "-f", :remove, @model[:name]
+        pkgget "-f", :remove, @resource[:name]
     end
 end
 
diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb
index adc722a66..70e6ed388 100755
--- a/lib/puppet/provider/package/darwinport.rb
+++ b/lib/puppet/provider/package/darwinport.rb
@@ -43,19 +43,19 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
         # Seems like you can always say 'upgrade'
-        output = port "upgrade", @model[:name]
+        output = port "upgrade", @resource[:name]
         if output =~ /^Error: No port/
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @model[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
         end
     end
 
     def query
         version = nil
         self.class.eachpkgashash do |hash|
-            if hash[:name] == @model[:name]
+            if hash[:name] == @resource[:name]
                 return hash
             end
         end
@@ -64,7 +64,7 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def latest
-        info = port :search, "^#{@model[:name]}$"
+        info = port :search, "^#{@resource[:name]}$"
 
         if $? != 0 or info =~ /^Error/
             return nil
@@ -77,7 +77,7 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def uninstall
-        port :uninstall, @model[:name]
+        port :uninstall, @resource[:name]
     end
 
     def update
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index 53b23ad64..45b351351 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -41,7 +41,7 @@ Puppet::Type.type(:package).provide :dpkg do
     end
 
     def install
-        unless file = @model[:source]
+        unless file = @resource[:source]
             raise ArgumentError, "You cannot install dpkg packages without a source"
         end
         dpkg "-i", file
@@ -57,12 +57,12 @@ Puppet::Type.type(:package).provide :dpkg do
         # list out our specific package
         begin
             output = dpkgquery("-W", "--showformat",
-                '${Status} ${Package} ${Version}\\n', @model[:name]
+                '${Status} ${Package} ${Version}\\n', @resource[:name]
             )
         rescue Puppet::ExecutionFailure
             # dpkg-query exits 1 if the package is not found.
             return {:ensure => :absent, :status => 'missing',
-                :name => @model[:name], :error => 'ok'}
+                :name => @resource[:name], :error => 'ok'}
 
         end
         # Our regex for matching dpkg-query output.  We could probably just
@@ -79,7 +79,7 @@ Puppet::Type.type(:package).provide :dpkg do
         else
             notice "Failed to handle dpkg-query line %s" % line.inspect
             return {:ensure => :absent, :status => 'missing',
-                :name => @model[:name], :error => 'ok'}
+                :name => @resource[:name], :error => 'ok'}
         end
 
         if hash[:error] != "ok"
@@ -98,11 +98,11 @@ Puppet::Type.type(:package).provide :dpkg do
     end
 
     def uninstall
-        dpkg "-r", @model[:name]
+        dpkg "-r", @resource[:name]
     end
 
     def purge
-        dpkg "--purge", @model[:name]
+        dpkg "--purge", @resource[:name]
 	 end
 end
 
diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index f1649efa4..e9fbf6a4c 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -16,19 +16,19 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        if @model[:source]
+        if @resource[:source]
             return super
         end
 
-        pkgadd "-r", @model[:name]
+        pkgadd "-r", @resource[:name]
     end
 
     def query
         self.class.list
 
-        if @model.is(:ensure)
+        if @resource.is(:ensure)
             return :listed
         else
             return nil
@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 
     def uninstall
-        pkgdelete "%s-%s" % [@model[:name], @model.should(:ensure)]
+        pkgdelete "%s-%s" % [@resource[:name], @resource.should(:ensure)]
     end
 end
 
diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb
index d68031826..572069e9b 100755
--- a/lib/puppet/provider/package/gem.rb
+++ b/lib/puppet/provider/package/gem.rb
@@ -62,16 +62,16 @@ Puppet::Type.type(:package).provide :gem do
 
     def install(useversion = true)
         command = ["install"]
-        if (! @model.should(:ensure).is_a? Symbol) and useversion
-            command << "-v" << @model.should(:ensure)
+        if (! @resource.should(:ensure).is_a? Symbol) and useversion
+            command << "-v" << @resource.should(:ensure)
         end
         # Always include dependencies
         command << "--include-dependencies"
 
-        if source = @model[:source]
+        if source = @resource[:source]
             command << source
         else
-            command << @model[:name]
+            command << @resource[:name]
         end
 
         gemcmd(*command)
@@ -79,17 +79,17 @@ Puppet::Type.type(:package).provide :gem do
 
     def latest
         # This always gets the latest version available.
-        hash = self.class.gemlist(:justme => @model[:name])
+        hash = self.class.gemlist(:justme => @resource[:name])
 
         return hash[:ensure]
     end
 
     def query
-        self.class.gemlist(:justme => @model[:name], :local => true)
+        self.class.gemlist(:justme => @resource[:name], :local => true)
     end
 
     def uninstall
-        gemcmd "uninstall", "-x", "-a", @model[:name]
+        gemcmd "uninstall", "-x", "-a", @resource[:name]
     end
 
     def update
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 2d1b6d07d..e910a41ba 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -56,22 +56,22 @@ Puppet::Type.type(:package).provide :openbsd do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
 
-        unless @model[:source]
+        unless @resource[:source]
             raise Puppet::Error,
                 "You must specify a package source for BSD packages"
         end
 
-        pkgadd @model[:source]
+        pkgadd @resource[:source]
     end
 
     def query
         hash = {}
-        info = pkginfo @model[:name]
+        info = pkginfo @resource[:name]
 
         # Search for the version info
-        if info =~ /Information for #{@model[:name]}-(\S+)/
+        if info =~ /Information for #{@resource[:name]}-(\S+)/
             hash[:ensure] = $1
         else
             return nil
@@ -86,7 +86,7 @@ Puppet::Type.type(:package).provide :openbsd do
     end
 
     def uninstall
-        pkgdelete @model[:name]
+        pkgdelete @resource[:name]
     end
 end
 
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb
index c57f8a890..e3d211fef 100644
--- a/lib/puppet/provider/package/pkgdmg.rb
+++ b/lib/puppet/provider/package/pkgdmg.rb
@@ -97,8 +97,8 @@ Puppet::Type.type(:package).provide :pkgdmg do
     end # def self.installpkgdmg
 
     def query
-        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@model[:name]}")
-            return {:name => @model[:name], :ensure => :present}
+        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
+            return {:name => @resource[:name], :ensure => :present}
         else
             return nil
         end
@@ -106,10 +106,10 @@ Puppet::Type.type(:package).provide :pkgdmg do
 
     def install
         source = nil
-        unless source = @model[:source]
+        unless source = @resource[:source]
             self.fail "Mac OS X PKG DMG's must specify a package source."
         end
-        unless name = @model[:name]
+        unless name = @resource[:name]
             self.fail "Mac OS X PKG DMG's must specify a package name."
         end
         self.class.installpkgdmg(source,name)
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index 4c1655495..32a664e1b 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -37,7 +37,7 @@ Puppet::Type.type(:package).provide :portage do
     end
 
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
         name = package_name
         unless should == :present or should == :latest
             # We must install a specific version
@@ -48,7 +48,7 @@ Puppet::Type.type(:package).provide :portage do
 
     # The common package name format.
     def package_name
-        "%s/%s" % [@model[:category], @model[:name]]
+        "%s/%s" % [@resource[:category], @resource[:name]]
     end
 
     def uninstall
@@ -63,8 +63,8 @@ Puppet::Type.type(:package).provide :portage do
         result_format = /(\S+) (\S+) \[(.*)\] \[[^0-9]*([^\s:]*)(:\S*)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :version_available, :slot, :vendor, :description]
 
-        search_field = @model[:category] ? "--category-name" : "--name"
-        search_value = @model[:category] ? package_name : @model[:name]
+        search_field = @resource[:category] ? "--category-name" : "--name"
+        search_value = @resource[:category] ? package_name : @resource[:name]
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 
         begin
@@ -88,7 +88,7 @@ Puppet::Type.type(:package).provide :portage do
 
             case packages.size
                 when 0
-		    not_found_value = "%s/%s" % [@model[:category] ? @model[:category] : "<unspecified category>", @model[:name]]
+		    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
                     raise Puppet::PackageError.new("No package found with the specified name [#{not_found_value}]")
                 when 1
                     return packages[0]
diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb
index 685479285..76eed9c2a 100755
--- a/lib/puppet/provider/package/ports.rb
+++ b/lib/puppet/provider/package/ports.rb
@@ -19,17 +19,17 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
         # -p: create a package
         # -N: install if the package is missing, otherwise upgrade
         # -P: prefer binary packages
-        cmd = %w{-p -N -P} << @model[:name]
+        cmd = %w{-p -N -P} << @resource[:name]
 
         output = portupgrade(*cmd)
         if output =~ /\*\* No such /
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @model[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
         end
     end
 
     # If there are multiple packages, we only use the last one
     def latest
-        cmd = ["-v", @model[:name]]
+        cmd = ["-v", @resource[:name]]
 
         begin
             output = portversion(*cmd)
@@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
     def query
         self.class.list
 
-        if @model.is(:ensure) and @model.is(:ensure) != :absent
+        if @resource.is(:ensure) and @resource.is(:ensure) != :absent
             return :listed
         else
             return nil
@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd do
     end
 
     def uninstall
-        portuninstall @model[:name]
+        portuninstall @resource[:name]
     end
 
     def update
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index 894f2b450..abd9fa022 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :rpm do
     # a hash with entries :instance => fully versioned package name, and 
     # :ensure => version-release
     def query
-        cmd = ["-q", @model[:name], "--nosignature", "--nodigest", "--qf", "#{NVRFORMAT} #{VERSIONSTRING}\n"]
+        cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NVRFORMAT} #{VERSIONSTRING}\n"]
 
         begin
             output = rpm(*cmd)
@@ -75,29 +75,29 @@ Puppet::Type.type(:package).provide :rpm do
 
     # Here we just retrieve the version from the file specified in the source.
     def latest
-        unless source = @model[:source]
-            @model.fail "RPMs must specify a package source"
+        unless source = @resource[:source]
+            @resource.fail "RPMs must specify a package source"
         end
         
-        cmd = [command(:rpm), "-q", "--qf", "#{VERSIONSTRING}", "-p", "#{@model[:source]}"]
+        cmd = [command(:rpm), "-q", "--qf", "#{VERSIONSTRING}", "-p", "#{@resource[:source]}"]
         version = execfail(cmd, Puppet::Error)
         return version
     end
 
     def install
         source = nil
-        unless source = @model[:source]
-            @model.fail "RPMs must specify a package source"
+        unless source = @resource[:source]
+            @resource.fail "RPMs must specify a package source"
         end
-        if @model.should(:ensure) == @model.is(:ensure) ||
-           @model.should(:ensure) == :latest && @model.is(:ensure) == latest
+        if @resource.should(:ensure) == @resource.is(:ensure) ||
+           @resource.should(:ensure) == :latest && @resource.is(:ensure) == latest
             # RPM gets pissy if you try to install an already 
             # installed package
             return
         end
 
         flag = "-i"
-        if @model.is(:ensure) != :absent
+        if @resource.is(:ensure) != :absent
             flag = "-U"
         end
 
diff --git a/lib/puppet/provider/package/rug.rb b/lib/puppet/provider/package/rug.rb
index e6a70ae2a..4916aaec8 100644
--- a/lib/puppet/provider/package/rug.rb
+++ b/lib/puppet/provider/package/rug.rb
@@ -7,9 +7,9 @@ Puppet.type(:package).provide :rug, :parent => :rpm do
 
     # Install a package using 'rug'.
     def install
-        should = @model.should(:ensure)
+        should = @resource.should(:ensure)
         self.debug "Ensuring => #{should}"
-        wanted = @model[:name]
+        wanted = @resource[:name]
 
         # XXX: We don't actually deal with epochs here.
         case should
@@ -33,12 +33,12 @@ Puppet.type(:package).provide :rug, :parent => :rpm do
         #rug can only get a list of *all* available packages?
         output = rug "list-updates"
 
-        if output =~ /#{@model[:name]}\s*\|\s*([0-9\.\-]+)/
+        if output =~ /#{@resource[:name]}\s*\|\s*([0-9\.\-]+)/
             return $1
         else
             # rug didn't find updates, pretend the current
             # version is the latest
-            return @model.is(:ensure)
+            return @resource.is(:ensure)
         end
     end
 
diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb
index c9a71e200..ea169548d 100755
--- a/lib/puppet/provider/package/sun.rb
+++ b/lib/puppet/provider/package/sun.rb
@@ -85,7 +85,7 @@ Puppet::Type.type(:package).provide :sun do
         if device
             cmd += " -d #{device}"
         end
-        cmd += " #{@model[:name]}"
+        cmd += " #{@resource[:name]}"
 
         begin
             # list out all of the packages
@@ -115,28 +115,28 @@ Puppet::Type.type(:package).provide :sun do
     end
 
     def install
-        unless @model[:source]
+        unless @resource[:source]
             raise Puppet::Error, "Sun packages must specify a package source"
         end
         cmd = []
         
-        if @model[:adminfile]
-            cmd << "-a" << @model[:adminfile]
+        if @resource[:adminfile]
+            cmd << "-a" << @resource[:adminfile]
         end
 
-        if @model[:responsefile]
-            cmd << "-r" << @model[:responsefile]
+        if @resource[:responsefile]
+            cmd << "-r" << @resource[:responsefile]
         end
 
-        cmd << "-d" << @model[:source]
-        cmd << "-n" << @model[:name]
+        cmd << "-d" << @resource[:source]
+        cmd << "-n" << @resource[:name]
 
         pkgadd cmd
     end
 
     # Retrieve the version from the current package file.
     def latest
-        hash = info2hash(@model[:source])
+        hash = info2hash(@resource[:source])
         hash[:ensure]
     end
 
@@ -147,18 +147,18 @@ Puppet::Type.type(:package).provide :sun do
     def uninstall
         command  = ["-n"]
 
-        if @model[:adminfile]
-            command << "-a" << @model[:adminfile]
+        if @resource[:adminfile]
+            command << "-a" << @resource[:adminfile]
         end
 
-        command << @model[:name]
+        command << @resource[:name]
         pkgrm command
     end
 
     # Remove the old package, and install the new one.  This will probably
     # often fail.
     def update
-        if @model.is(:ensure) != :absent
+        if @resource.is(:ensure) != :absent
             self.uninstall
         end
         self.install
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index c195e18fb..42234e8ab 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -9,7 +9,7 @@ Puppet.type(:package).provide :up2date, :parent => :rpm do
 
     # Install a package using 'up2date'.
     def install
-        up2date "-u", @model[:name]
+        up2date "-u", @resource[:name]
 
         unless self.query
             raise Puppet::ExecutionFailure.new(
@@ -23,12 +23,12 @@ Puppet.type(:package).provide :up2date, :parent => :rpm do
         #up2date can only get a list of *all* available packages?
         output = up2date "--show-available"
 
-        if output =~ /#{@model[:name]}-(\d+.*)\.\w+/
+        if output =~ /#{@resource[:name]}-(\d+.*)\.\w+/
             return $1
         else
             # up2date didn't find updates, pretend the current
             # version is the latest
-            return @model.is(:ensure)
+            return @resource.is(:ensure)
         end
     end
 
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
index 262048900..75acb4cae 100755
--- a/lib/puppet/provider/package/yum.rb
+++ b/lib/puppet/provider/package/yum.rb
@@ -6,11 +6,11 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm do
 
     def install
 
-        should = @model.should(:ensure)
-	self.debug "Ensuring => #{should}"
-	wanted = @model[:name]
+        should = @resource.should(:ensure)
+        self.debug "Ensuring => #{should}"
+        wanted = @resource[:name]
 
-	# XXX: We don't actually deal with epochs here.
+        # XXX: We don't actually deal with epochs here.
         case should
         when true, false, Symbol
             # pass
@@ -30,14 +30,14 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm do
 
     # What's the latest package version available?
     def latest
-        output = yum "-d", "0", "-e", "0", :list, :available, @model[:name]
+        output = yum "-d", "0", "-e", "0", :list, :available, @resource[:name]
 
-        if output =~ /^#{@model[:name]}\S+\s+(\S+)\s/
+        if output =~ /^#{@resource[:name]}\S+\s+(\S+)\s/
             return $1
         else
             # Yum didn't find updates, pretend the current
             # version is the latest
-            return @model[:ensure]
+            return @resource[:ensure]
         end
     end
 
-- 
cgit