[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

nfagerlund nick.fagerlund at gmail.com
Tue May 10 08:04:57 UTC 2011


The following commit has been merged in the experimental branch:
commit b18f045d6349e4edf5d1593285d6788203fe81ae
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Thu Feb 17 11:56:55 2011 -0800

    (#1204) Make rake gen_manpages fail explicitly if ronn isn't present
    
    Entire series:
    paired-with: Daniel Pittman <daniel at puppetlabs.com>
    paired-with: Paul Berry <paul at puppetlabs.com>

diff --git a/tasks/rake/manpages.rake b/tasks/rake/manpages.rake
index f48e57c..f7275e4 100644
--- a/tasks/rake/manpages.rake
+++ b/tasks/rake/manpages.rake
@@ -7,8 +7,8 @@ task :gen_manpages do
   bins  = Dir.glob(%w{bin/*})
   applications  = Dir.glob(%w{lib/puppet/application/*})
   # Locate ronn
-  ronn = %x{which ronn}
-  ronn.chomp!
+  ronn = %x{which ronn}.chomp
+  unless File.executable?(ronn) then fail("Ronn does not appear to be installed.") end
 
   # Create puppet.conf.5 man page
   %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration > ./man/man5/puppetconf.5.ronn}

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list