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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit b389392c23032090c80cfe42ee19c2d8d45dff64
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Jul 1 15:17:01 2010 -0700

    maint: spec_helper should only get loaded once
    
    Added a C-style if-defined? guard to spec_helper.rb to make sure that it
    only gets evaluated once. (The file is getting loaded multiple times
    because ruby gets confused by relative paths in `require` statements)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0ea24bb..e1b65e6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,6 @@
+unless defined? SPEC_HELPER_IS_LOADED
+SPEC_HELPER_IS_LOADED = 1
+
 dir = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH.unshift("#{dir}/")
@@ -75,3 +78,5 @@ Puppet[:vardir] = "/dev/null"
 class Object
     alias :must :should
 end
+
+end

-- 
Puppet packaging for Debian