[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 bfad735335bfd65d48b14af2998bd4ce2d86ab96
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed Apr 21 00:09:28 2010 -0700

    feature #2276 Single Executable: rdoc paths on ubuntu
    
    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 <jes5199 at gmail.com>

diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
index a80f422..1245b10 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
@@ -375,7 +375,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

-- 
Puppet packaging for Debian