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

[Pieter van de Bruggen]

The following commit has been merged in the experimental branch:
commit 977684ee83627194c78c81e30c001f3d9062f6f3
Author: Pieter van de Bruggen <pieter at puppetlabs.com>
Date:   Mon Apr 18 11:10:00 2011 -0700

    (Maint) Fixing an order-dependent failure.
    
    Running spec/unit/option_spec.rb before requiring puppet/interface
    caused a circular require, and a failure.
    
    Paired-With: Max Martin

diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb
index c04c2bf..ab18261 100644
--- a/lib/puppet/interface/option.rb
+++ b/lib/puppet/interface/option.rb
@@ -1,5 +1,3 @@
-require 'puppet/interface'
-
 class Puppet::Interface::Option
   def initialize(parent, *declaration, &block)
     @parent   = parent
diff --git a/spec/unit/interface/option_spec.rb b/spec/unit/interface/option_spec.rb
index 4c24dc9..e77b46e 100755
--- a/spec/unit/interface/option_spec.rb
+++ b/spec/unit/interface/option_spec.rb
@@ -1,3 +1,4 @@
+require 'puppet/interface'
 require 'puppet/interface/option'
 
 describe Puppet::Interface::Option do

-- 
Puppet packaging for Debian