30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
commit 77bd79083879c7bca15c00d96c570da6faa16839
|
|
Author: Matthew Booth <mbooth@redhat.com>
|
|
Date: Tue May 17 10:00:34 2011 +0100
|
|
|
|
p2v-server: Fix YAML error parsing metadata
|
|
|
|
The YAML perl module will produce a parse error when receiving metadata YAML
|
|
produced by virt-p2v. YAML::Tiny and YAML::Syck both parse it fine.
|
|
Unfortunately, YAML::Any is only provided by the YAML module, so it will always
|
|
be installed on Fedora, and will always break. We therefore need to pick one of
|
|
the others explicitly. I picked YAML::Tiny as it has fewer dependencies.
|
|
|
|
diff --git a/p2v/server/virt-p2v-server.pl b/p2v/server/virt-p2v-server.pl
|
|
index d062d9d..2dfae24 100755
|
|
--- a/p2v/server/virt-p2v-server.pl
|
|
+++ b/p2v/server/virt-p2v-server.pl
|
|
@@ -20,7 +20,11 @@ use warnings;
|
|
use strict;
|
|
|
|
use IO::Handle;
|
|
-use YAML::Any;
|
|
+
|
|
+# The YAML module doesn't support YAML generated by Ruby. YAML::Tiny and
|
|
+# YAML::Syck are both fine. We can't use YAML::Any here because that breaks by
|
|
+# default.
|
|
+use YAML::Tiny;
|
|
|
|
use Locale::TextDomain 'virt-v2v';
|
|
|