[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 9958c805dd90acadbb56ed3095e665d8afa990cd
Author: Rein Henrichs <rein at puppetlabs.com>
Date:   Wed Jun 23 15:51:08 2010 -0700

    [#4064]  Modify the Rails spec to use the block form of confine
    
    This prevents the lookup of the ActiveRecord constant from being
    performed until after we know that the Rails feature is available (from
    checking the confine of the parent describe block).

diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index ecf48b6..dd8d7de 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -48,7 +48,7 @@ describe Puppet::Rails, "when initializing any connection" do
     end
 
     describe "on ActiveRecord 2.1.x" do
-        confine "ActiveRecord 2.1.x" => (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1)
+        confine("ActiveRecord 2.1.x") { ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1 }
 
         it "should set ActiveRecord::Base.allow_concurrency" do
             ActiveRecord::Base.expects(:allow_concurrency=).with(true)

-- 
Puppet packaging for Debian