Ticket #973: packagename.patch.0.24

diff -ur original.puppet-0.24.0/lib/puppet/provider/package/appdmg.rb puppet-0.24.0/lib/puppet/provider/package/appdmg.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/appdmg.rb        2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/appdmg.rb 2007-12-27 15:28:51.000000000 -0500
@@ -95,8 +95,8 @@
     end # def self.installpkgdmg
 
     def query
-        if FileTest.exists?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}")
-            return {:name => @resource[:name], :ensure => :present}
+        if FileTest.exists?("/var/db/.puppet_appdmg_installed_#{self.package_name}")
+            return {:name => self.package_name, :ensure => :present}
         else
             return nil
         end
@@ -107,7 +107,7 @@
         unless source = @resource[:source]
             self.fail "Mac OS X PKG DMG's must specify a package source."
         end
-        unless name = @resource[:name]
+        unless name = self.package_name
             self.fail "Mac OS X PKG DMG's must specify a package name."
         end
         self.class.installpkgdmg(source,name)
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/apple.rb puppet-0.24.0/lib/puppet/provider/package/apple.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/apple.rb 2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/apple.rb  2007-12-27 15:28:58.000000000 -0500
@@ -35,8 +35,8 @@
     end
 
     def query
-        if FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg")
-            return {:name => @resource[:name], :ensure => :present}
+        if FileTest.exists?("/Library/Receipts/#{self.package_name}.pkg")
+            return {:name => self.package_name, :ensure => :present}
         else
             return nil
         end
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/apt.rb puppet-0.24.0/lib/puppet/provider/package/apt.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/apt.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/apt.rb    2007-12-27 15:29:13.000000000 -0500
@@ -49,7 +49,7 @@
 
         checkforcdrom()
 
-        str = @resource[:name]
+        str = self.package_name
         case should
         when true, false, Symbol
             # pass
@@ -78,7 +78,7 @@
 
     # What's the latest package version available?
     def latest
-        output = aptcache :policy,  @resource[:name]
+        output = aptcache :policy, self.package_name
 
         if output =~ /Candidate:\s+(\S+)\s/
             return $1
@@ -106,11 +106,11 @@
     end
 
     def uninstall
-        aptget "-y", "-q", :remove, @resource[:name]
+        aptget "-y", "-q", :remove, self.package_name
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
+        aptget '-y', '-q', 'remove', '--purge', self.package_name
         # workaround a "bug" in apt, that already removed packages are not purged
         super
     end
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/aptitude.rb puppet-0.24.0/lib/puppet/provider/package/aptitude.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/aptitude.rb      2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/aptitude.rb       2007-12-27 15:29:16.000000000 -0500
@@ -25,7 +25,7 @@
     end
 
     def purge
-        aptitude '-y', 'purge', @resource[:name]
+        aptitude '-y', 'purge', self.package_name
        end
 end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/aptrpm.rb puppet-0.24.0/lib/puppet/provider/package/aptrpm.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/aptrpm.rb        2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/aptrpm.rb 2007-12-27 15:29:19.000000000 -0500
@@ -25,7 +25,7 @@
     def install
         should = @resource.should(:ensure)
 
-        str = @resource[:name]
+        str = self.package_name
         case should
         when true, false, Symbol
             # pass
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/blastwave.rb puppet-0.24.0/lib/puppet/provider/package/blastwave.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/blastwave.rb     2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/blastwave.rb      2007-12-27 15:29:21.000000000 -0500
@@ -86,7 +86,7 @@
     end
 
     def install
-        pkgget "-f", :install, @resource[:name]
+        pkgget "-f", :install, self.package_name
     end
 
     # Retrieve the version from the current package file.
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/darwinport.rb puppet-0.24.0/lib/puppet/provider/package/darwinport.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/darwinport.rb    2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/darwinport.rb     2007-12-27 15:29:30.000000000 -0500
@@ -47,16 +47,16 @@
         should = @resource.should(:ensure)
 
         # Seems like you can always say 'upgrade'
-        output = port "upgrade", @resource[:name]
+        output = port "upgrade", self.package_name
         if output =~ /^Error: No port/
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % self.package_name
         end
     end
 
     def query
         version = nil
         self.class.eachpkgashash do |hash|
-            if hash[:name] == @resource[:name]
+            if hash[:name] == self.package_name
                 return hash
             end
         end
@@ -65,7 +65,7 @@
     end
 
     def latest
-        info = port :search, "^#{@resource[:name]}$"
+        info = port :search, "^#{self.package_name}$"
 
         if $? != 0 or info =~ /^Error/
             return nil
@@ -78,7 +78,7 @@
     end
 
     def uninstall
-        port :uninstall, @resource[:name]
+        port :uninstall, self.package_name
     end
 
     def update
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/dpkg.rb puppet-0.24.0/lib/puppet/provider/package/dpkg.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/dpkg.rb  2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/dpkg.rb   2007-12-27 15:29:38.000000000 -0500
@@ -64,7 +64,7 @@
     def latest
         output = dpkg_deb "--show", @resource[:source]
         matches = /^(\S+)\t(\S+)$/.match(output).captures
-        unless matches[0].match(@resource[:name])
+        unless matches[0].match(self.package_name)
             Puppet.warning "source doesn't contain named package, but %s" % matches[0]
         end
         matches[1]
@@ -80,12 +80,12 @@
         # list out our specific package
         begin
             output = dpkgquery("-W", "--showformat",
-                '${Status} ${Package} ${Version}\\n', @resource[:name]
+                '${Status} ${Package} ${Version}\\n', self.package_name
             )
         rescue Puppet::ExecutionFailure
             # dpkg-query exits 1 if the package is not found.
             return {:ensure => :purged, :status => 'missing',
-                :name => @resource[:name], :error => 'ok'}
+                :name => self.package_name, :error => 'ok'}
 
         end
         # Our regex for matching dpkg-query output.  We could probably just
@@ -102,7 +102,7 @@
         else
             notice "Failed to handle dpkg-query line %s" % line.inspect
             return {:ensure => :absent, :status => 'missing',
-                :name => @resource[:name], :error => 'ok'}
+                :name => self.package_name, :error => 'ok'}
         end
 
         if hash[:error] != "ok"
@@ -123,11 +123,11 @@
     end
 
     def uninstall
-        dpkg "-r", @resource[:name]
+        dpkg "-r", self.package_name
     end
 
     def purge
-        dpkg "--purge", @resource[:name]
+        dpkg "--purge", self.package_name
     end
 end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/fink.rb puppet-0.24.0/lib/puppet/provider/package/fink.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/fink.rb  2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/fink.rb   2007-12-27 15:29:44.000000000 -0500
@@ -29,7 +29,7 @@
         end
         should = @resource.should(:ensure)
 
-        str = @resource[:name]
+        str = self.package_name
         case should
         when true, false, Symbol
             # pass
@@ -48,7 +48,7 @@
 
     # What's the latest package version available?
     def latest
-        output = aptcache :policy,  @resource[:name]
+        output = aptcache :policy,  self.package_name
 
         if output =~ /Candidate:\s+(\S+)\s/
             return $1
@@ -80,7 +80,7 @@
     end
 
     def purge
-        aptget '-y', '-q', 'remove', '--purge', @resource[:name]
+        aptget '-y', '-q', 'remove', '--purge', self.package_name
      end
 end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/freebsd.rb puppet-0.24.0/lib/puppet/provider/package/freebsd.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/freebsd.rb       2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/freebsd.rb        2007-12-27 15:29:48.000000000 -0500
@@ -22,7 +22,7 @@
             return super
         end
 
-        pkgadd "-r", @resource[:name]
+        pkgadd "-r", self.package_name
     end
 
     def query
@@ -35,7 +35,7 @@
     end
 
     def uninstall
-        pkgdelete "%s-%s" % [@resource[:name], @resource.should(:ensure)]
+        pkgdelete "%s-%s" % [self.package_name, @resource.should(:ensure)]
     end
 end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/gem.rb puppet-0.24.0/lib/puppet/provider/package/gem.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/gem.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/gem.rb    2007-12-27 15:29:53.000000000 -0500
@@ -75,7 +75,7 @@
         if source = @resource[:source]
             command << source
         else
-            command << @resource[:name]
+            command << self.package_name
         end
 
         gemcmd(*command)
@@ -83,17 +83,17 @@
 
     def latest
         # This always gets the latest version available.
-        hash = self.class.gemlist(:justme => @resource[:name])
+        hash = self.class.gemlist(:justme => self.package_name)
 
         return hash[:ensure]
     end
 
     def query
-        self.class.gemlist(:justme => @resource[:name], :local => true)
+        self.class.gemlist(:justme => self.package_name, :local => true)
     end
 
     def uninstall
-        gemcmd "uninstall", "-x", "-a", @resource[:name]
+        gemcmd "uninstall", "-x", "-a", self.package_name
     end
 
     def update
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/openbsd.rb puppet-0.24.0/lib/puppet/provider/package/openbsd.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/openbsd.rb       2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/openbsd.rb        2007-12-27 15:29:59.000000000 -0500
@@ -63,10 +63,10 @@
 
     def query
         hash = {}
-        info = pkginfo @resource[:name]
+        info = pkginfo self.package_name
 
         # Search for the version info
-        if info =~ /Information for #{@resource[:name]}-(\S+)/
+        if info =~ /Information for #{self.package_name}-(\S+)/
             hash[:ensure] = $1
         else
             return nil
@@ -81,7 +81,7 @@
     end
 
     def uninstall
-        pkgdelete @resource[:name]
+        pkgdelete self.package_name
     end
 end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/pkgdmg.rb puppet-0.24.0/lib/puppet/provider/package/pkgdmg.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/pkgdmg.rb        2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/pkgdmg.rb 2007-12-27 15:30:10.000000000 -0500
@@ -171,8 +171,8 @@
     end # def self.installpkgdmg
 
     def query
-        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
-            return {:name => @resource[:name], :ensure => :present}
+        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{self.package_name}")
+            return {:name => self.package_name, :ensure => :present}
         else
             return nil
         end
@@ -183,7 +183,7 @@
         unless source = @resource[:source]
             self.fail "Mac OS X PKG DMG's must specify a package source."
         end
-        unless name = @resource[:name]
+        unless name = self.package_name
             self.fail "Mac OS X PKG DMG's must specify a package name."
         end
         self.class.installpkgdmg(source,name)
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/portage.rb puppet-0.24.0/lib/puppet/provider/package/portage.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/portage.rb       2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/portage.rb        2007-12-27 15:30:19.000000000 -0500
@@ -55,7 +55,7 @@
 
     # The common package name format.
     def package_name
-        @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name]
+        @resource[:category] ? "%s/%s" % [@resource[:category], self.package_name] : self.package_name
     end
 
     def uninstall
@@ -98,7 +98,7 @@
 
             case packages.size
                 when 0
-                   not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
+                   not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", self.package_name]
                     raise Puppet::PackageError.new("No package found with the specified name [#{not_found_value}]")
                 when 1
                     return packages[0]
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/ports.rb puppet-0.24.0/lib/puppet/provider/package/ports.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/ports.rb 2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/ports.rb  2007-12-27 15:30:27.000000000 -0500
@@ -19,17 +19,17 @@
     def install
         # -N: install if the package is missing, otherwise upgrade
         # -M: yes, we're a batch, so don't ask any questions
-        cmd = %w{-N -M BATCH=yes} << @resource[:name]
+        cmd = %w{-N -M BATCH=yes} << self.package_name
 
         output = portupgrade(*cmd)
         if output =~ /\*\* No such /
-            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
+            raise Puppet::ExecutionFailure, "Could not find package %s" % self.package_name
         end
     end
 
     # If there are multiple packages, we only use the last one
     def latest
-        cmd = ["-v", @resource[:name]]
+        cmd = ["-v", self.package_name]
 
         begin
             output = portversion(*cmd)
@@ -83,7 +83,7 @@
     end
 
     def uninstall
-        portuninstall @resource[:name]
+        portuninstall self.package_name
     end
 
     def update
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/rpm.rb puppet-0.24.0/lib/puppet/provider/package/rpm.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/rpm.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/rpm.rb    2007-12-27 15:30:31.000000000 -0500
@@ -44,7 +44,7 @@
     # :ensure => version-release
     def query
         unless @property_hash[:epoch]
-            cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
+            cmd = ["-q", self.package_name, "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
 
             begin
                 output = rpm(*cmd)
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/rug.rb puppet-0.24.0/lib/puppet/provider/package/rug.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/rug.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/rug.rb    2007-12-27 15:30:52.000000000 -0500
@@ -12,7 +12,7 @@
     def install
         should = @resource.should(:ensure)
         self.debug "Ensuring => #{should}"
-        wanted = @resource[:name]
+        wanted = self.package_name
 
         # XXX: We don't actually deal with epochs here.
         case should
@@ -36,7 +36,7 @@
         #rug can only get a list of *all* available packages?
         output = rug "list-updates"
 
-        if output =~ /#{@resource[:name]}\s*\|\s*([0-9\.\-]+)/
+        if output =~ /#{self.package_name}\s*\|\s*([0-9\.\-]+)/
             return $1
         else
             # rug didn't find updates, pretend the current
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/sun.rb puppet-0.24.0/lib/puppet/provider/package/sun.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/sun.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/sun.rb    2007-12-27 15:30:57.000000000 -0500
@@ -85,7 +85,7 @@
         if device
             cmd += " -d #{device}"
         end
-        cmd += " #{@resource[:name]}"
+        cmd += " #{self.package_name}"
 
         begin
             # list out all of the packages
@@ -129,7 +129,7 @@
         end
 
         cmd << "-d" << @resource[:source]
-        cmd << "-n" << @resource[:name]
+        cmd << "-n" << self.package_name
 
         pkgadd cmd
     end
@@ -151,7 +151,7 @@
             command << "-a" << @resource[:adminfile]
         end
 
-        command << @resource[:name]
+        command << self.package_name
         pkgrm command
     end
 
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/up2date.rb puppet-0.24.0/lib/puppet/provider/package/up2date.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/up2date.rb       2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/up2date.rb        2007-12-27 15:31:02.000000000 -0500
@@ -9,7 +9,7 @@
 
     # Install a package using 'up2date'.
     def install
-        up2date "-u", @resource[:name]
+        up2date "-u", self.package_name
 
         unless self.query
             raise Puppet::ExecutionFailure.new(
@@ -23,7 +23,7 @@
         #up2date can only get a list of *all* available packages?
         output = up2date "--showall"
 
-        if output =~ /^#{@resource[:name]}-(\d+.*)\.\w+/
+        if output =~ /^#{self.package_name}-(\d+.*)\.\w+/
             return $1
         else
             # up2date didn't find updates, pretend the current
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/urpmi.rb puppet-0.24.0/lib/puppet/provider/package/urpmi.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/urpmi.rb 2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/urpmi.rb  2007-12-27 15:31:16.000000000 -0500
@@ -19,7 +19,7 @@
     def install
         should = @resource.should(:ensure)
         self.debug "Ensuring => #{should}"
-        wanted = @resource[:name]
+        wanted = self.package_name
 
         # XXX: We don't actually deal with epochs here.
         case should
@@ -41,9 +41,9 @@
 
     # What's the latest package version available?
     def latest
-        output = urpmi "-S",  :available, @resource[:name]
+        output = urpmi "-S",  :available, self.package_name
 
-        if output =~ /^#{@resource[:name]}\S+\s+(\S+)\s/
+        if output =~ /^#{self.package_name}\S+\s+(\S+)\s/
             return $1
         else
             # urpmi didn't find updates, pretend the current
diff -ur original.puppet-0.24.0/lib/puppet/provider/package/yum.rb puppet-0.24.0/lib/puppet/provider/package/yum.rb
--- original.puppet-0.24.0/lib/puppet/provider/package/yum.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package/yum.rb    2007-12-27 15:31:19.000000000 -0500
@@ -45,7 +45,7 @@
     def install
         should = @resource.should(:ensure)
         self.debug "Ensuring => #{should}"
-        wanted = @resource[:name]
+        wanted = self.package_name
 
         # XXX: We don't actually deal with epochs here.
         case should
@@ -73,7 +73,7 @@
 
     # What's the latest package version available?
     def latest
-        upd = self.class.updates[@resource[:name]]
+        upd = self.class.updates[self.package_name]
         unless upd.nil?
             # FIXME: there could be more than one update for a package
             # because of multiarch
diff -ur original.puppet-0.24.0/lib/puppet/provider/package.rb puppet-0.24.0/lib/puppet/provider/package.rb
--- original.puppet-0.24.0/lib/puppet/provider/package.rb       2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/provider/package.rb        2007-12-27 15:47:50.000000000 -0500
@@ -26,4 +26,8 @@
         end
         @property_hash.dup
     end
+    
+    def package_name
+        @resource[:packagename] || @resource[:name]
+    end
 end
diff -ur original.puppet-0.24.0/lib/puppet/type/package.rb puppet-0.24.0/lib/puppet/type/package.rb
--- original.puppet-0.24.0/lib/puppet/type/package.rb   2007-12-27 15:06:12.000000000 -0500
+++ puppet-0.24.0/lib/puppet/type/package.rb    2007-12-27 15:50:38.000000000 -0500
@@ -207,6 +207,30 @@
             isnamevar
         end
 
+        newparam(:packagename) do
+            desc "The actually package name as referenced internally by the
+            package provider.
+            
+            This overrides the 'name' parameter, and lets you use different
+            names to reference packages with the same internal name in
+            different providers. Otherwise, puppet would think you were
+            trying to redefine the same package.
+            
+                packagename { \"mysql-yum\":
+                    ensure   => installed,
+                    package  => \"mysql\",
+                    provider => yum;
+                }
+
+                packagename { \"mysql-gem\":
+                    ensure   => installed,
+                    package  => \"mysql\",
+                    provider => gem;
+                }
+            
+            "
+        end
+        
         newparam(:source) do
             desc "Where to find the actual package.  This must be a local file
                 (or on a network file system) or a URL that your specific