Libguestfs - Jan 2014 - Re: [PATCH] hivex: ruby: Minor fix for building with Ruby 1.8

---
 ruby/Rakefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index 204e37c..5ad1502 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -22,7 +22,7 @@ require 'rake/testtask'
 # Used to be rake/rdoctask.  Now it's rdoc/task.
 begin
   require 'rdoc/task'
-rescue
+rescue LoadError
   require 'rake/rdoctask'
 end
 
@@ -31,7 +31,7 @@ end
 begin
   require 'rubygems/package_task'
   gempackagetask='Gem::PackageTask'
-rescue
+rescue LoadError
   require 'rake/gempackagetask'
   gempackagetask='Rake::GemPackageTask'
 end
-- 
1.8.5.2

On Thu, Jan 16, 2014 at 09:01:27PM +0100, Hilko Bengen
wrote:
> ---
>  ruby/Rakefile.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
> index 204e37c..5ad1502 100644
> --- a/ruby/Rakefile.in
> +++ b/ruby/Rakefile.in
> @@ -22,7 +22,7 @@ require 'rake/testtask'
>  # Used to be rake/rdoctask.  Now it's rdoc/task.
>  begin
>    require 'rdoc/task'
> -rescue
> +rescue LoadError
>    require 'rake/rdoctask'
>  end
>  
> @@ -31,7 +31,7 @@ end
>  begin
>    require 'rubygems/package_task'
>    gempackagetask='Gem::PackageTask'
> -rescue
> +rescue LoadError
>    require 'rake/gempackagetask'
>    gempackagetask='Rake::GemPackageTask'
>  end
> -- 
> 1.8.5.2
ACK, same as this libguestfs fix:

commit 480bd3a6d8a56b37936b08c94eb99f0921fe65de
Author: Richard W.M. Jones <rjones@redhat.com>
Date:   Fri Dec 27 13:21:38 2013 +0000

    RHEL 6: ruby: Fix fallback to rake/rdoctask for old rake.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/

* Richard W.M. Jones:
> ACK, same as this libguestfs fix:
It looks like I might be able to ship the Debian package for the next
version without any specific patches. Hooray!

I believe that I have pushed all the changes that I needed in the hivex
library itself. How about doing another release?

Cheers,
-Hilko