[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 6dfac977d355593ee13dcb80f25ad02da466062c
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Dec 10 15:36:48 2009 -0800

    Fixing 2907 rspec crash when spec/unit/application/puppetrun.rb is run after spec/unit/util/ldap/connection.rb
    
    the ldap/connection spec creates a mock LDAP class that causes `require 'ldap'`
    to explode. If `require 'ldap'` happens first, then we're OK.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/unit/util/ldap/connection.rb b/spec/unit/util/ldap/connection.rb
index 8bc85a6..bead64d 100755
--- a/spec/unit/util/ldap/connection.rb
+++ b/spec/unit/util/ldap/connection.rb
@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/util/ldap/connection'
 
 # So our mocks and such all work, even when ldap isn't available.
-unless defined?(LDAP::Conn)
+unless Puppet.features.ldap?
     class LDAP
         class Conn
             def initialize(*args)

-- 
Puppet packaging for Debian