[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 51bcebe38cab6088c901f1006339bbe40a36d161

[Stéphan Gorget]

The following commit has been merged in the upstream branch:
commit 5412eab12df89a7a701ffea4f5dfb98d0f56985e
Author: Stéphan Gorget <phantez at gmail.com>
Date:   Thu Nov 5 00:51:34 2009 +0100

    Fixed : 2788 - ftools missing in Ruby 1.9
    
    Signed-off-by: Stéphan Gorget <phantez at gmail.com>

diff --git a/install.rb b/install.rb
index ec16c4b..1280f04 100755
--- a/install.rb
+++ b/install.rb
@@ -35,7 +35,13 @@
 require 'rbconfig'
 require 'find'
 require 'fileutils'
-require 'ftools' # apparently on some system ftools doesn't get loaded
+begin
+  require 'ftools' # apparently on some system ftools doesn't get loaded
+  $haveftools = true
+rescue LoadError
+  puts "ftools not found.  Using FileUtils instead.."
+  $haveftools = false
+end
 require 'optparse'
 require 'ostruct'
 
@@ -91,9 +97,15 @@ def do_libs(libs, strip = 'lib/')
     libs.each do |lf|
         olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
         op = File.dirname(olf)
-        File.makedirs(op, true)
-        File.chmod(0755, op)
-        File.install(lf, olf, 0644, true)
+        if $haveftools
+          File.makedirs(op, true)
+          File.chmod(0755, op)
+          File.install(lf, olf, 0644, true)
+        else
+          FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+          FileUtils.chmod(0755, op)
+          FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
+        end
     end
 end
 

-- 
Packaging of Facter for debian