From 81cc9bf4892170e2e36a7b0b302a74f88c6825d1 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Fri, 29 Aug 2008 12:17:04 +1000 Subject: Fixed #1533 - changed permissions for man directory --- install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install.rb') diff --git a/install.rb b/install.rb index b5aba4215..73bcc6db5 100755 --- a/install.rb +++ b/install.rb @@ -102,7 +102,7 @@ def do_man(man, strip = 'man/') omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, '')) om = File.dirname(omf) File.makedirs(om, true) - File.chmod(0644, om) + File.chmod(0755, om) File.install(mf, omf, 0644, true) gzip = %x{which gzip} gzip.chomp! -- cgit From a7306e14b9aa064218d051602715c987aebb8417 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sat, 13 Sep 2008 14:21:06 +1000 Subject: Fixed #1553 - Puppet and Facter cannot both install the plist module into two different locations --- install.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'install.rb') diff --git a/install.rb b/install.rb index 73bcc6db5..3fa3822c5 100755 --- a/install.rb +++ b/install.rb @@ -60,6 +60,7 @@ rescue end PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi} +MIN_FACTER_VERSION = 1.5 InstallOptions = OpenStruct.new @@ -115,6 +116,15 @@ def check_prereqs PREREQS.each { |pre| begin require pre + if pre == "facter" + # to_f isn't quite exact for strings like "1.5.1" but is good + # enough for this purpose. + facter_version = Facter.version.to_f + if facter_version < MIN_FACTER_VERSION + puts "Facter version: %s; minimum required: %s; cannot install" % [facter_version, MIN_FACTER_VERSION] + exit -1 + end + end rescue LoadError puts "Could not load %s; cannot install" % pre exit -1 -- cgit