[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc3-129-g74f8285

[James Turnbull]

The following commit has been merged in the upstream branch:
commit e860907724ede52bf798d22d157ddc86f9c4646b
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Fri Sep 3 15:35:01 2010 -0700

    [#4660] Avoid passing rake and autotest args to puppet tests
    
    Autotest was failing on puppet apply tests because it was reading
    autotest's args as the manifest file and then erroring because it wasn't
    a valid file.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ab7ff6c..2fe0c36 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,9 @@ $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
 $LOAD_PATH.unshift("#{dir}/../lib")
 
+# Don't want puppet getting the command line arguments for rake or autotest
+ARGV.clear
+
 require 'puppet'
 require 'mocha'
 gem 'rspec', '>=1.2.9'

-- 
Puppet packaging for Debian