Release 0.8.1-2
Pull in patch for RHBZ#705113
This commit is contained in:
parent
2f01f5c174
commit
1e0b15983e
29
virt-v2v-0.8.1-04-77bd7908.patch
Normal file
29
virt-v2v-0.8.1-04-77bd7908.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
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';
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: virt-v2v
|
Name: virt-v2v
|
||||||
Version: 0.8.1
|
Version: 0.8.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Convert a virtual machine to run on KVM
|
Summary: Convert a virtual machine to run on KVM
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -21,6 +21,7 @@ Patch0: virt-v2v-0.8.1-00-44eb9021-modified.patch
|
|||||||
Patch1: virt-v2v-0.8.1-01-e34a8c09.patch
|
Patch1: virt-v2v-0.8.1-01-e34a8c09.patch
|
||||||
Patch2: virt-v2v-0.8.1-02-fadb1929.patch
|
Patch2: virt-v2v-0.8.1-02-fadb1929.patch
|
||||||
Patch3: virt-v2v-0.8.1-03-a965f7e0.patch
|
Patch3: virt-v2v-0.8.1-03-a965f7e0.patch
|
||||||
|
Patch4: virt-v2v-0.8.1-04-77bd7908.patch
|
||||||
|
|
||||||
# Unfortunately, despite really being noarch, we have to make virt-v2v arch
|
# Unfortunately, despite really being noarch, we have to make virt-v2v arch
|
||||||
# dependent to avoid build failures on architectures where libguestfs isn't
|
# dependent to avoid build failures on architectures where libguestfs isn't
|
||||||
@ -144,6 +145,7 @@ virt-p2v-image-builder is a tool to create a bootable virt-p2v live image.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__perl} Build.PL
|
%{__perl} Build.PL
|
||||||
@ -260,6 +262,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 17 2011 Matthew Booth <mbooth@redhat.com> - 0.8.1-2
|
||||||
|
- Remove echoe build dependency
|
||||||
|
- Fix YAML error during P2V (RHBZ#705113)
|
||||||
|
|
||||||
* Tue Apr 26 2011 Matthew Booth <mbooth@redhat.com> - 0.8.1-1
|
* Tue Apr 26 2011 Matthew Booth <mbooth@redhat.com> - 0.8.1-1
|
||||||
- Update to release 0.8.1
|
- Update to release 0.8.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user