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

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:30:27 UTC 2010


The following commit has been merged in the upstream branch:
commit 98581ad9d70b5c7a5fe65aee7117b6a92dab50fb
Author: Rein Henrichs <reinh at reinh.com>
Date:   Sat Apr 3 13:34:33 2010 -0700

    Fix builtins glob in single executable

diff --git a/sbin/puppet b/sbin/puppet
index d3472cc..f229898 100755
--- a/sbin/puppet
+++ b/sbin/puppet
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 appdir = File.join('puppet', 'application')
-builtins = Dir[File.join(appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')}
+absolute_appdir = $:.collect { |x| File.join(x,'puppet','application') }.detect{ |x| File.directory?(x) }
+builtins = Dir[File.join(absolute_appdir, '*.rb')].map{|fn| File.basename(fn, '.rb')}
 
 usage = "Usage: puppet command <space separated arguments>"
 available = "Available commands are: #{builtins.sort.join(', ')}"

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list