diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-04 14:22:38 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-04-04 14:22:38 -0700 |
| commit | cc7f0728df96fd36a7ddda9cea3c4db274533f68 (patch) | |
| tree | 030894996a09aaf8875f22ea060a33fcc89c8300 /install.rb | |
| parent | ea13fbc107aa96b55066178d07584115a2034b7d (diff) | |
| parent | 3e7ebbbb08120243f7e982f34b8256ec58af67b0 (diff) | |
| download | puppet-cc7f0728df96fd36a7ddda9cea3c4db274533f68.tar.gz puppet-cc7f0728df96fd36a7ddda9cea3c4db274533f68.tar.xz puppet-cc7f0728df96fd36a7ddda9cea3c4db274533f68.zip | |
Merge branch 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet into 2.6.next
* 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet:
Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
Diffstat (limited to 'install.rb')
| -rwxr-xr-x | install.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/install.rb b/install.rb index e8755e07a..351ba25d2 100755 --- 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/') |