[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 631552c58c9658780d0618c6b2fdfdc5a95465ea
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed May 12 15:42:39 2010 -0700

    Feature #2935: Applications should declare modes
    
    Add declarations for each application's run mode.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index 8a8e3ca..e8ed040 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -3,6 +3,7 @@ require 'puppet/application'
 class Puppet::Application::Agent < Puppet::Application
 
     should_parse_config
+    mode :agent
 
     attr_accessor :explicit_waitforcert, :args, :agent, :daemon, :host
 
diff --git a/lib/puppet/application/cert.rb b/lib/puppet/application/cert.rb
index 33410ee..219129b 100644
--- a/lib/puppet/application/cert.rb
+++ b/lib/puppet/application/cert.rb
@@ -3,6 +3,7 @@ require 'puppet/application'
 class Puppet::Application::Cert < Puppet::Application
 
     should_parse_config
+    mode :server
 
     attr_accessor :mode, :all, :ca, :digest, :signed
 
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 326265e..0f4381f 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -3,6 +3,7 @@ require 'puppet/application'
 class Puppet::Application::Doc < Puppet::Application
 
     should_not_parse_config
+    mode :master
 
     attr_accessor :unknown_args, :manifest
 
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 993d7df..17ff5de 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -3,6 +3,7 @@ require 'puppet/application'
 class Puppet::Application::Master < Puppet::Application
 
     should_parse_config
+    mode :master
 
     option("--debug", "-d")
     option("--verbose", "-v")

-- 
Puppet packaging for Debian