[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 9536723c95c5b9deff4c6c6d6423b23a7025e58b
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed May 12 18:29:37 2010 -0700

    Feature #2935: method extract require_application
    
    It's useful to be able to require specific applications' ruby source by
    name, even if we aren't about to run them.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb
index 4ab6d31..9003a0c 100644
--- a/lib/puppet/util/command_line.rb
+++ b/lib/puppet/util/command_line.rb
@@ -40,11 +40,15 @@ module Puppet
                 [usage, available].join("\n")
             end
 
+            def require_application(application)
+                require File.join(appdir, application)
+            end
+
             def execute
                 if subcommand_name.nil?
                     puts usage_message
                 elsif available_subcommands.include?(subcommand_name) #subcommand
-                    require File.join(appdir, subcommand_name)
+                    require_application subcommand_name
                     Puppet::Application.find(subcommand_name).new(self).run
                 else
                     abort "Error: Unknown command #{subcommand_name}.\n#{usage_message}"

-- 
Puppet packaging for Debian