pool/virt-manager
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#962221 - virt-install: 'NoneType' object has no attribute

Browse Source 
'isdigit' 
  eae7dc06-fix-URL-installs-when-content-length-header-missing.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=291
This commit is contained in:
Charles Arnold 2016-01-18 20:48:51 +00:00 committed by Git OBS Bridge
parent bac3f6bcbd
commit 9851188d58
7 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eae7dc06-fix-URL-installs-when-content-length-header-missing.patch Normal file
View File

@ -0,0 +1,25 @@
Subject: urlfetcher: Fix URL installs when content-length header missing
From: Cole Robinson crobinso@redhat.com Tue Jan 12 12:45:02 2016 -0500
Date: Tue Jan 12 12:45:02 2016 -0500:
Git: eae7dc061968a83fef8ebb632c8f939621ff22b1
Suggested-by: bduff@sjm.com
Index: virt-manager-1.3.2/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -186,8 +186,11 @@ class _HTTPURLFetcher(_URLFetcher):
"""
response = requests.get(url, stream=True)
response.raise_for_status()
- size = response.headers.get('content-length')
- return response, size.isdigit() and int(size) or None
+ try:
+ size = int(response.headers.get('content-length'))
+ except:
+ size = None
+ return response, size
def _write(self, urlobj, fileobj):
"""

7
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 18 13:43:47 MST 2016 - carnold@suse.com
- bsc#962221 - virt-install: 'NoneType' object has no attribute
'isdigit'
eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 8 11:50:46 MST 2016 - carnold@suse.com Fri Jan 8 11:50:46 MST 2016 - carnold@suse.com

5
virt-manager.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virt-manager # spec file for package virt-manager
# #
# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define with_guestfs 0 %define with_guestfs 0
%define askpass_package "openssh-askpass" %define askpass_package "openssh-askpass"
%define qemu_user "qemu" %define qemu_user "qemu"
@ -37,6 +38,7 @@ Source1: virt-install.rb
Source2: virt-install.desktop Source2: virt-install.desktop
# Upstream Patches # Upstream Patches
Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch
Patch2: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
# SUSE Only # SUSE Only
Patch70: virtman-desktop.patch Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch Patch71: virtman-kvm.patch
@ -158,6 +160,7 @@ machine).
%setup -q %setup -q
# Upstream Patches # Upstream Patches
%patch1 -p1 %patch1 -p1
%patch2 -p1
# SUSE Only # SUSE Only
%patch70 -p1 %patch70 -p1
%patch71 -p1 %patch71 -p1

10
virtinst-add-ppc64-arch-support.patch
View File

@ -1,10 +1,10 @@
Reference: bnc#869024 Reference: bnc#869024
Add s390x and ppc64 support Add s390x and ppc64 support
Index: virt-manager-1.3.0/virtinst/urlfetcher.py Index: virt-manager-1.3.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.0/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -427,6 +427,10 @@ def _distroFromSUSEContent(fetcher, arch @@ -430,6 +430,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586" arch = "i586"
elif cbuf.find("s390x") != -1: elif cbuf.find("s390x") != -1:
arch = "s390x" arch = "s390x"
@ -15,7 +15,7 @@ Index: virt-manager-1.3.0/virtinst/urlfetcher.py
dclass = GenericDistro dclass = GenericDistro
if distribution: if distribution:
@@ -966,10 +970,12 @@ class SuseDistro(Distro): @@ -969,10 +973,12 @@ class SuseDistro(Distro):
oldkern += "64" oldkern += "64"
oldinit += "64" oldinit += "64"

8
virtinst-detect-oes-distros.patch
View File

@ -1,10 +1,10 @@
Enhancement to correctly detect Open Enterprise Server media is Enhancement to correctly detect Open Enterprise Server media is
selected as the installation source. selected as the installation source.
Index: virt-manager-1.3.0/virtinst/urlfetcher.py Index: virt-manager-1.3.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.0/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -439,6 +439,10 @@ def _distroFromSUSEContent(fetcher, arch @@ -442,6 +442,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLEDDistro dclass = SLEDDistro
if distro_version is None: if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]

20
virtinst-nfs-install-sanitize.patch
View File

@ -5,10 +5,10 @@ A fix for accessing nfs mounted media. A comment in the code states,
and carry the latter form around internally" and carry the latter form around internally"
We need the RFC version to work correctly whereas redhat's anaconda We need the RFC version to work correctly whereas redhat's anaconda
needs their own modified version. needs their own modified version.
Index: virt-manager-1.3.0/virtinst/util.py Index: virt-manager-1.3.2/virtinst/util.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/util.py --- virt-manager-1.3.2.orig/virtinst/util.py
+++ virt-manager-1.3.0/virtinst/util.py +++ virt-manager-1.3.2/virtinst/util.py
@@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only @@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only
return (index_dom0, zypper_output) return (index_dom0, zypper_output)
@ -32,10 +32,10 @@ Index: virt-manager-1.3.0/virtinst/util.py
+ +
+ return url + return url
+ +
Index: virt-manager-1.3.0/virtinst/distroinstaller.py Index: virt-manager-1.3.2/virtinst/distroinstaller.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/distroinstaller.py --- virt-manager-1.3.2.orig/virtinst/distroinstaller.py
+++ virt-manager-1.3.0/virtinst/distroinstaller.py +++ virt-manager-1.3.2/virtinst/distroinstaller.py
@@ -49,6 +49,8 @@ def _sanitize_url(url): @@ -49,6 +49,8 @@ def _sanitize_url(url):
""" """
Do nothing for http or ftp, but make sure nfs is in the expected format Do nothing for http or ftp, but make sure nfs is in the expected format
@ -45,10 +45,10 @@ Index: virt-manager-1.3.0/virtinst/distroinstaller.py
if url.startswith("nfs://"): if url.startswith("nfs://"):
# Convert RFC compliant NFS nfs://server/path/to/distro # Convert RFC compliant NFS nfs://server/path/to/distro
# to what mount/anaconda expect nfs:server:/path/to/distro # to what mount/anaconda expect nfs:server:/path/to/distro
Index: virt-manager-1.3.0/virtinst/urlfetcher.py Index: virt-manager-1.3.2/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.0/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -33,6 +33,7 @@ import urllib2 @@ -33,6 +33,7 @@ import urllib2
import urlparse import urlparse
@ -57,7 +57,7 @@ Index: virt-manager-1.3.0/virtinst/urlfetcher.py
######################################################################### #########################################################################
@@ -295,7 +296,8 @@ class _MountedURLFetcher(_LocalURLFetche @@ -298,7 +299,8 @@ class _MountedURLFetcher(_LocalURLFetche
logging.debug("Preparing mount at " + self._srcdir) logging.debug("Preparing mount at " + self._srcdir)
if self.location.startswith("nfs:"): if self.location.startswith("nfs:"):

8
virtinst-s390x-disable-graphics.patch
View File

@ -1,9 +1,9 @@
Reference: bnc#869024 Reference: bnc#869024
Disable graphics on s390x Disable graphics on s390x
Index: virt-manager-1.3.0/virtinst/guest.py Index: virt-manager-1.3.2/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.3.0.orig/virtinst/guest.py --- virt-manager-1.3.2.orig/virtinst/guest.py
+++ virt-manager-1.3.0/virtinst/guest.py +++ virt-manager-1.3.2/virtinst/guest.py
@@ -123,7 +123,10 @@ class Guest(XMLBuilder): @@ -123,7 +123,10 @@ class Guest(XMLBuilder):
self.skip_default_channel = False self.skip_default_channel = False
self.skip_default_sound = False self.skip_default_sound = False
@ -43,7 +43,7 @@ Index: virt-manager-1.3.0/virtinst/guest.py
return return
self.add_device(VirtualGraphics(self.conn)) self.add_device(VirtualGraphics(self.conn))
@@ -1052,7 +1057,7 @@ class Guest(XMLBuilder): @@ -1034,7 +1039,7 @@ class Guest(XMLBuilder):
if self._hv_only_supports_virtio(): if self._hv_only_supports_virtio():
return True return True