[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Matt Robinson]

The following commit has been merged in the experimental branch:
commit 64be97bdfe029e0fa5f33a06963f4c18ca3968d4
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Fri Apr 8 16:05:41 2011 -0700

    maint: Fix sqlite3 require to really be optional
    
    You need to specifically rescue LoadError if you want requires to be
    optional.
    
    Paired-with: Nick Lewis

diff --git a/spec/unit/indirector/facts/inventory_active_record_spec.rb b/spec/unit/indirector/facts/inventory_active_record_spec.rb
index 4e20532..02dd495 100755
--- a/spec/unit/indirector/facts/inventory_active_record_spec.rb
+++ b/spec/unit/indirector/facts/inventory_active_record_spec.rb
@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'spec_helper'
-require 'sqlite3' rescue nil
+begin
+  require 'sqlite3'
+rescue LoadError
+end
 require 'tempfile'
 require 'puppet/rails'
 

-- 
Puppet packaging for Debian