patch orig.file patch.file --- that was easy....

On Jun 4, 10:03 am, CraftyTech <[email protected]> wrote:
> Hello All,
>
>      I've setup a fresh vm in my dev environment with Ruby 1.9.1.
> Facter won't install from source with this level of ruby and It'll
> produce the following error:
>
> install.rb:38:in `require': no such file to load -- ftools (LoadError)
>  from install.rb:38:in `<main>'
>
> There's a diff patch available on the puppetlabs website to address
> this bug.  My question is the following (pardon the ignorance); How do
> I use this diff patch?  Do I use it instead of of the install.rb file,
> or do I do some sort of redirect append to the original one?  If it
> makes a difference, here's the content of the diff patch:
>
> 35      35
>
> require 'rbconfig'
>
> 36      36
>
> require 'find'
>
> 37      37
>
> require 'fileutils'
>
> 38
>
> require 'ftools' # apparently on some system ftools doesn't get loaded
>
>         38
>
> begin
>
>         39
>
>   require 'ftools' # apparently on some system ftools doesn't get
> loaded
>
>         40
>
>   $haveftools = true
>
>         41
>
> rescue LoadError
>
>         42
>
>   puts "ftools not found.  Using FileUtils instead.."
>
>         43
>
>   $haveftools = false
>
>         44
>
> end
>
> 39      45
>
> require 'optparse'
>
> 40      46
>
> require 'ostruct'
>
> 41      47
>
> ...     ...
> 92      98
>
>   libs.each do |lf|
>
> 93      99
>
>     olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
>
> 94      100
>
>     op = File.dirname(olf)
>
> 95
>
>     File.makedirs(op, true)
>
> 96
>
>     File.chmod(0755, op)
>
> 97
>
>     File.install(lf, olf, 0644, true)
>
>         101
>
>     if $haveftools
>
>         102
>
>       File.makedirs(op, true)
>
>         103
>
>       File.chmod(0755, op)
>
>         104
>
>       File.install(lf, olf, 0644, true)
>
>         105
>
>     else
>
>         106
>
>       FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
>
>         107
>
>       FileUtils.chmod(0755, op)
>
>         108
>
>       FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
>
>         109
>
>     end
>
> 98      110
>
>   end
>
> 99      111
>
> end
>
> 100     112
>
> ...     ...
> 102     114
>
>   man.each do |mf|
>
> 103     115
>
>     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
>
> 104     116
>
>     om = File.dirname(omf)
>
> 105
>
>     File.makedirs(om, true)
>
> 106
>
>     File.chmod(0755, om)
>
> 107
>
>     File.install(mf, omf, 0644, true)
>
>         117
>
>     if $haveftools
>
>         118
>
>       File.makedirs(om, true)
>
>         119
>
>       File.chmod(0644, om)
>
>         120
>
>       File.install(mf, omf, 0644, true)
>
>         121
>
>     else
>
>         122
>
>       FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
>
>         123
>
>       FileUtils.chmod(0755, om)
>
>         124
>
>       FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
>
>         125
>
>     end
>
> 108     126
>
>     gzip = %x{which gzip}
>
> 109     127
>
>     gzip.chomp!
>
> 110     128
>
>     %x{#{gzip} -f #{omf}}
>
> Cheers,
>
> Henry

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Users" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-users?hl=en.

Reply via email to