on ubuntu, --help was failing to find the path to the old executables, which still contain the rdoc help message
Signed-off-by: Jesse Wolfe <[email protected]> --- lib/puppet/application.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index c5ddc22..e2fd1c3 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -115,7 +115,7 @@ require 'optparse' class Puppet::Application include Puppet::Util - BINDIRS = File.expand_path(File.dirname(__FILE__)) + '/../../{sbin,bin}' + BINDIRS = %w{sbin bin}.map{|dir| File.expand_path(File.dirname(__FILE__)) + "/../../#{dir}/*"}.join(" ") @@applications = {} def self.applications; @@applications end @@ -379,7 +379,7 @@ class Puppet::Application # RH:FIXME: My goodness, this is ugly. ::RDoc.const_set("PuppetSourceFile", @name) def (::RDoc).caller - docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{BINDIRS}/*`.chomp + docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{BINDIRS}`.chomp super << "#{docfile}:0" end ::RDoc::usage && exit -- 1.6.3.3 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
