Ignore the pkg directory if it exists, and fix up a couple of tests that were erroring out, which also will help the confinement of package types a bit more.

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

lib/puppet/provider/package/aptrpm.rb

@@ -10,6 +10,15 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     commands :aptcache => "/usr/bin/apt-cache"
     commands :rpm => "/usr/bin/rpm"
 
+    confine :true => begin
+            rpm('-ql', 'rpm')
+        rescue Puppet::ExecutionFailure
+            false
+        else
+            true
+        end
+
+
     # Install a package using 'apt-get'.  This function needs to support
     # installing a specific version.
     def install

lib/puppet/provider/package/rpm.rb

@@ -11,6 +11,15 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     commands :rpm => "rpm"
 
+    confine :true => begin
+            rpm('-ql', 'rpm')
+        rescue Puppet::ExecutionFailure
+            false
+        else
+            true
+        end
+
+
     def self.instances
         packages = []
 

test/rails/collection.rb

@@ -188,7 +188,7 @@ class TestRailsCollection < PuppetTest::TestCase
         # Make our configuration
         host = Puppet::Rails::Host.new(:name => "myhost")
 
-        host.resources.build(:title => "/tmp/hosttest", :type => "file",
+        host.resources.build(:title => "/tmp/hosttest", :restype => "file",
             :exported => true)
 
         host.save