Merge branch '0.24.x'

Conflicts:

	lib/puppet/metatype/container.rb
	lib/puppet/metatype/instances.rb
	lib/puppet/metatype/metaparams.rb
	lib/puppet/metatype/relationships.rb
	lib/puppet/metatype/schedules.rb

1 files changed, 11 insertions, 1 deletions

diff --git a/install.rb b/install.rb
index a2cbdb429..c99d7dacd 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
 
@@ -102,7 +103,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!
@@ -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