2:01 p.m.
---
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
2:08 p.m.
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(a)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/
2:31 p.m.
New subject: hivex -- time for 1.3.9?
* 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
7:27 a.m.
New subject: hivex -- time for 1.3.9?
On Thu, Jan 16, 2014 at 09:31:05PM +0100, Hilko Bengen wrote:
* 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?
Good idea, I'll take a look at this now.
Thanks, Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
7:45 a.m.
New subject: hivex -- time for 1.3.9?
On Thu, Jan 16, 2014 at 09:31:05PM +0100, Hilko Bengen wrote:
* 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?
hivex 1.3.9 has been released now:
http://libguestfs.org/download/hivex/
BTW there is a regression (or maybe not) in the extra test suite.
I added this fix:
http://git.annexia.org/?p=hivex-test-data.git;a=commitdiff;h=d1b6c9d29428...
(which doesn't make any sense if you view it in the git web UI, you
have to actually look at the encoding in a terminal). However now I
would need to revert that commit to make the test suite pass.
It looks as if hivexregedit isn't writing UTF-8 encoded strings for
names. However I do not know what (real) REGEDIT writes, or what the
correct thing to do here is.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
3996
days inactive
3997
days old
4 comments
2 participants
participants (2)
-
Hilko Bengen -
Richard W.M. Jones