Actually commit the changes to lib/puppet that were supposed to be part of [2223] (Fuck svn and it's partial-repository-by-default behaviour)

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2224 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 16 insertions, 8 deletions

diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index 6fa70e56a..79a9e5f8e 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -16,10 +16,6 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     # Debian boxes, and the only thing that differs is that it can
     # install packages from remote sites.
 
-    def aptcmd(*args)
-        aptget(*args)
-    end
-
     def checkforcdrom
         unless defined? @@checkedforcdrom
             if FileTest.exists? "/etc/apt/sources.list"
@@ -73,9 +69,9 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
             end
         end
 
-        cmd << :install << str
+        cmd << 'install' << str
         
-        aptcmd(cmd)
+        aptget(*cmd)
     end
 
     # What's the latest package version available?
@@ -127,9 +123,13 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     end
 
     def uninstall
-        aptcmd "-y", "-q", :remove, @model[:name]
+        aptget "-y", "-q", :remove, @model[:name]
     end
 
+    def purge
+        aptget '-y', '-q', 'remove', '--purge', @model[:name]
+     end
+
     def versionable?
         true
     end
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index a959e34db..240c3fd82 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -6,7 +6,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
 
     ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
-    def aptcmd(*args)
+    def aptget(*args)
         args.flatten!
         # Apparently aptitude hasn't always supported a -q flag.
         if args.include?("-q")
@@ -21,6 +21,10 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt do
             )
         end
     end
+
+    def purge
+        aptitude '-y', 'purge', @model[:name]
+	 end
 end
 
 # $Id$
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index eb1911524..53b23ad64 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -100,6 +100,10 @@ Puppet::Type.type(:package).provide :dpkg do
     def uninstall
         dpkg "-r", @model[:name]
     end
+
+    def purge
+        dpkg "--purge", @model[:name]
+	 end
 end
 
 # $Id$