[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 19e98f994916482c930005efe938c5f0cac66dec
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Sep 15 09:43:48 2009 +1000

    Fixed #2608 - install.rb will not run on ruby 1.9.1 due to ftools being deprecated

diff --git a/install.rb b/install.rb
index 5a01648..44cf88a 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'
 
@@ -92,9 +98,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
 
@@ -102,9 +114,15 @@ def do_man(man, strip = 'man/')
   man.each do |mf|
     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
     om = File.dirname(omf)
-    File.makedirs(om, true)
-    File.chmod(0755, om)
-    File.install(mf, omf, 0644, true)
+    if $haveftools
+      File.makedirs(om, true)
+      File.chmod(0644, om)
+      File.install(mf, omf, 0644, true)
+    else
+      FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+      FileUtils.chmod(0755, om)
+      FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+    end
     gzip = %x{which gzip}
     gzip.chomp!
     %x{#{gzip} -f #{omf}}

-- 
Puppet packaging for Debian