puppet 3.3.1.rc2 → 3.3.1.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2fd11250a51541a228242c70e648a625e8fc08
-  data.tar.gz: c0f9bc3f60a9306296d01e6b4f40520399230d6e
+  metadata.gz: 0efbe0e0e21b0391a01f1f2faab2d1b0226a26e7
+  data.tar.gz: 3ec5f8c802c8be9915e9442e3f4c2ee9d0b512ec
 SHA512:
-  metadata.gz: 3aac39e3ed1d2eeb992fa912576ae3a26749ee3e0b26c642616000080c961f471448b2ecc1f2ac920b1aaad04d2d3eb9c1fae2e252d49bd72985f6b5d50ef2f3
-  data.tar.gz: dd42835bc9e0049cc3d1b3145e9395efd3a0700a894a24bc34756e2cfcf9a3ba080a1e445900f57c5846b5d9fdefe7f4ac5731b554ca3502fb6945d612d60eeb
+  metadata.gz: 343e12a8a203d0c1eca34bc7f850d3e456717e09961b0fb62d5a826f635c911f4578619f3c4f4c8d201378cb0f0080526a341af514b61b51ea4ea9d779358c98
+  data.tar.gz: 51b63bad22e5ab099b2233fbef0b88e10f609432d74de59b2def5de71e6e8c9ad7a30b75f15bc89116b3ece9fed520eb0483a951dbe6f604338a70f7658e0f72

data/lib/puppet/provider/package/dpkg.rb

@@ -44,7 +44,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   self::DPKG_DESCRIPTION_DELIMITER = ':DESC:'
   self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} #{self::DPKG_DESCRIPTION_DELIMITER} ${Description}\\n#{self::DPKG_DESCRIPTION_DELIMITER}\\n'}
   self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*) #{self::DPKG_DESCRIPTION_DELIMITER} (.*)$}
-  self::DPKG_PACKAGE_NOT_FOUND_REGEX = /No packages found matching/
+  self::DPKG_PACKAGE_NOT_FOUND_REGEX = /no package.*match/i
   self::FIELDS= [:desired, :error, :status, :name, :ensure, :description]
   self::END_REGEX = %r{^#{self::DPKG_DESCRIPTION_DELIMITER}$}
 

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.3.1-rc2'
+  PUPPETVERSION = '3.3.1-rc3'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/provider/package/dpkg_spec.rb

@@ -290,12 +290,24 @@ desired ok status name ensure :DESC: summary text
       parser_test(no_description, package_hash.merge(:description => ''))
     end
 
-    it "parses dpkg reporting that package does not exist without warning about a failed match (#22529)" do
-      Puppet.expects(:warning).never
-      pipe = StringIO.new("No packages found matching non-existent-package")
-      Puppet::Util::Execution.expects(:execpipe).with(query_args).yields(pipe).raises(Puppet::ExecutionFailure.new('no package found'))
+    context "dpkg-query versions < 1.16" do
+      it "parses dpkg-query 1.15 reporting that package does not exist without warning about a failed match (#22529)" do
+        Puppet.expects(:warning).never
+        pipe = StringIO.new("No packages found matching non-existent-package")
+        Puppet::Util::Execution.expects(:execpipe).with(query_args).yields(pipe).raises(Puppet::ExecutionFailure.new('no package found'))
+
+        expect(provider.query).to eq({:ensure=>:purged, :status=>"missing", :name=>"name", :error=>"ok"})
+      end
+    end
+
+    context "dpkg-query versions >= 1.16" do
+      it "parses dpkg-query 1.16 reporting that package does not exist without warning about a failed match (#22529)" do
+        Puppet.expects(:warning).never
+        pipe = StringIO.new("dpkg-query: no packages found matching non-existent-package")
+        Puppet::Util::Execution.expects(:execpipe).with(query_args).yields(pipe).raises(Puppet::ExecutionFailure.new('no package found'))
 
-      expect(provider.query).to eq({:ensure=>:purged, :status=>"missing", :name=>"name", :error=>"ok"})
+        expect(provider.query).to eq({:ensure=>:purged, :status=>"missing", :name=>"name", :error=>"ok"})
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.1.rc2
+  version: 3.3.1.rc3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter