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

[test branch]

The following commit has been merged in the upstream branch:
commit 8465cd08d0e522c8ef871df7d3a5bf216e1d7d59
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Mar 26 17:02:14 2010 -0700

    Resolving conflicts with reinh:feature/master/single_executable
    
    Puppet is now main, and the variable got renamed to reflect that.

diff --git a/spec/unit/application/main.rb b/spec/unit/application/main.rb
index 497ee6b..ef96267 100755
--- a/spec/unit/application/main.rb
+++ b/spec/unit/application/main.rb
@@ -232,7 +232,7 @@ describe "Puppet" do
             it "should raise an error if we can't find the node" do
                 Puppet::Node::Facts.expects(:find).returns(nil)
 
-                lambda { @puppet.main }.should raise_error
+                lambda { @main.main }.should raise_error
             end
 
             it "should find the node" do

-- 
Puppet packaging for Debian