Fixed puppetlabs#6554 - Missing $haveftool if/else conditional in ins…

…tall.rb breaking Ruby 1.9
colinPL · Mar 2, 2011 · 3e7ebbb · 3e7ebbb
1 parent 85e3174
commit 3e7ebbb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/install.rb b/install.rb
@@ -92,8 +92,12 @@ def do_configs(configs, target, strip = 'conf/')
   Dir.mkdir(target) unless File.directory? target
   configs.each do |cf|
     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
-    File.install(cf, ocf, 0644, true)
-  end
+    if $haveftools
+      File.install(cf, ocf, 0644, true)
+    else
+      FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
+    end
+   end
 end
 
 def do_bins(bins, target, strip = 's?bin/')