- Replace virtinst-replace-unar-with-other-archivers.patch with the
upstream version 21fd079e-replace-unar-with-other-archivers.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=302
This commit is contained in:
Charles Arnold
Git OBS Bridge
parent
0ac26d8208
commit
8188afbabe
@ -1,13 +1,56 @@
|
||||
References: bnc#934270
|
||||
We don't ship unar with any suse distro (not even in Factory).
|
||||
Until we do, keep this patch to execute the correct archiver
|
||||
program.
|
||||
|
||||
Index: virt-manager-1.3.2/virtconv/formats.py
|
||||
===================================================================
|
||||
--- virt-manager-1.3.2.orig/virtconv/formats.py
|
||||
+++ virt-manager-1.3.2/virtconv/formats.py
|
||||
@@ -118,6 +118,8 @@ def _find_input(input_file, parser, prin
|
||||
Subject: Replace the unar to more common archivers
|
||||
From: Lin Ma lma@suse.com Wed Jan 6 12:22:57 2016 +0800
|
||||
Date: Sun Jan 10 18:23:29 2016 -0500:
|
||||
Git: 21fd079eb19899cf5283c6a55e9006d1fa0619b9
|
||||
|
||||
Because some of distributions dont provide the unar (universal archiver),
|
||||
Using more common archivers to replace it.
|
||||
|
||||
Signed-off-by: Lin Ma <lma@suse.com>
|
||||
|
||||
(crobinso: adjust test suite)
|
||||
|
||||
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
|
||||
index b03ca3c..b046c66 100644
|
||||
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
|
||||
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
|
||||
@@ -73,5 +73,5 @@
|
||||
</domain>
|
||||
|
||||
|
||||
-test-vmx-zip.zip appears to be an archive, running: unar -o /var/tmp/virt-convert-tmp test-vmx-zip.zip
|
||||
+test-vmx-zip.zip appears to be an archive, running: unzip -o -d /var/tmp/virt-convert-tmp /home/crobinso/src/virt-manager/tests/virtconv-files/vmx_input/test-vmx-zip.zip
|
||||
Copying MS-DOS.vmdk to /var/lib/libvirt/images/MS-DOS
|
||||
diff --git a/tests/virtconvtest.py b/tests/virtconvtest.py
|
||||
index 7f1c735..622117f 100644
|
||||
--- a/tests/virtconvtest.py
|
||||
+++ b/tests/virtconvtest.py
|
||||
@@ -15,7 +15,6 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
# MA 02110-1301 USA.
|
||||
|
||||
-from distutils.spawn import find_executable
|
||||
import glob
|
||||
import os
|
||||
import StringIO
|
||||
@@ -66,10 +65,6 @@ class TestVirtConv(unittest.TestCase):
|
||||
if disk_format:
|
||||
out_path += ".disk_%s" % disk_format
|
||||
|
||||
- if (os.path.splitext(in_path)[1] in [".zip"] and
|
||||
- not find_executable("unar")):
|
||||
- self.skipTest("Install 'unar' to run all tests.")
|
||||
-
|
||||
try:
|
||||
os.chdir(os.path.dirname(in_path))
|
||||
self._convert_helper(in_path, out_path, in_type, disk_format)
|
||||
diff --git a/virtconv/formats.py b/virtconv/formats.py
|
||||
index 9a6d237..ed8a66e 100644
|
||||
--- a/virtconv/formats.py
|
||||
+++ b/virtconv/formats.py
|
||||
@@ -118,6 +118,8 @@ def _find_input(input_file, parser, print_cb):
|
||||
try:
|
||||
ext = os.path.splitext(input_file)[1]
|
||||
tempdir = None
|
||||
@ -16,7 +59,7 @@ Index: virt-manager-1.3.2/virtconv/formats.py
|
||||
if ext and ext[1:] in ["zip", "gz", "ova",
|
||||
"tar", "bz2", "bzip2", "7z", "xz"]:
|
||||
basedir = "/var/tmp"
|
||||
@@ -129,19 +131,40 @@ def _find_input(input_file, parser, prin
|
||||
@@ -129,19 +131,40 @@ def _find_input(input_file, parser, print_cb):
|
||||
|
||||
base = os.path.basename(input_file)
|
||||
|
||||
@ -18,7 +18,7 @@ Index: virt-manager-1.3.2/virtconv/formats.py
|
||||
===================================================================
|
||||
--- virt-manager-1.3.2.orig/virtconv/formats.py
|
||||
+++ virt-manager-1.3.2/virtconv/formats.py
|
||||
@@ -240,6 +240,8 @@ class VirtConverter(object):
|
||||
@@ -263,6 +263,8 @@ class VirtConverter(object):
|
||||
"""
|
||||
binnames = ["qemu-img", "kvm-img"]
|
||||
|
||||
@ -27,7 +27,7 @@ Index: virt-manager-1.3.2/virtconv/formats.py
|
||||
if _is_test():
|
||||
executable = "/usr/bin/qemu-img"
|
||||
else:
|
||||
@@ -252,12 +254,23 @@ class VirtConverter(object):
|
||||
@@ -275,12 +277,23 @@ class VirtConverter(object):
|
||||
raise RuntimeError(_("None of %s tools found.") % binnames)
|
||||
|
||||
base = os.path.basename(absin)
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 23 13:02:36 MDT 2016 - carnold@suse.com
|
||||
|
||||
- Replace virtinst-replace-unar-with-other-archivers.patch with the
|
||||
upstream version
|
||||
21fd079e-replace-unar-with-other-archivers.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 15:03:06 MDT 2016 - carnold@suse.com
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define with_guestfs 0
|
||||
%define askpass_package "openssh-askpass"
|
||||
%define qemu_user "qemu"
|
||||
@ -37,9 +38,10 @@ Source1: virt-install.rb
|
||||
Source2: virt-install.desktop
|
||||
# Upstream Patches
|
||||
Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch
|
||||
Patch2: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
|
||||
Patch3: 1c221fd0-suse-ovmf-paths.patch
|
||||
Patch4: f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
|
||||
Patch2: 21fd079e-replace-unar-with-other-archivers.patch
|
||||
Patch3: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
|
||||
Patch4: 1c221fd0-suse-ovmf-paths.patch
|
||||
Patch5: f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
|
||||
# SUSE Only
|
||||
Patch70: virtman-desktop.patch
|
||||
Patch71: virtman-kvm.patch
|
||||
@ -75,9 +77,8 @@ Patch154: virtman-allow-creating-i686-vm.patch
|
||||
Patch160: virtinst-xen-drive-type.patch
|
||||
Patch161: virtinst-xenbus-disk-index-fix.patch
|
||||
Patch162: virtinst-refresh_before_fetch_pool.patch
|
||||
Patch163: virtinst-replace-unar-with-other-archivers.patch
|
||||
Patch164: virtinst-fix-sle12sp1-detection.patch
|
||||
Patch165: virtinst-fix-tumbleweed-detection.patch
|
||||
Patch163: virtinst-fix-sle12sp1-detection.patch
|
||||
Patch164: virtinst-fix-tumbleweed-detection.patch
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -161,6 +162,7 @@ machine).
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
# SUSE Only
|
||||
%patch70 -p1
|
||||
%patch71 -p1
|
||||
@ -198,7 +200,6 @@ machine).
|
||||
%patch162 -p1
|
||||
%patch163 -p1
|
||||
%patch164 -p1
|
||||
%patch165 -p1
|
||||
|
||||
%build
|
||||
%if %{qemu_user}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user