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

- bsc#1096819 - virt-install - Couldn't find hvm kernel for SUSE

Browse Source 
tree
  virtinst-python2-to-python3-conversion.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=428
This commit is contained in:
Charles Arnold 2018-06-20 17:51:05 +00:00 committed by Git OBS Bridge
parent 404c30b2d8
commit 3228f1bc39
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 20 11:04:14 MDT 2018 - carnold@suse.com
- bsc#1096819 - virt-install - Couldn't find hvm kernel for SUSE
tree
virtinst-python2-to-python3-conversion.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 19 11:22:52 MDT 2018 - carnold@suse.com Tue Jun 19 11:22:52 MDT 2018 - carnold@suse.com

22
virtinst-python2-to-python3-conversion.patch
View File

@ -458,7 +458,15 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
size = os.path.getsize(url) size = os.path.getsize(url)
return urlobj, size return urlobj, size
@@ -395,14 +399,14 @@ def _grabTreeinfo(fetcher): @@ -358,6 +362,7 @@ class _ISOURLFetcher(_URLFetcher):
logging.debug("Running isoinfo: %s", cmd)
output = subprocess.check_output(cmd)
+ output = output.decode()
self._cache_file_list = output.splitlines(False)
@@ -395,14 +400,14 @@ def _grabTreeinfo(fetcher):
return None return None
try: try:
@ -475,7 +483,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
logging.debug("Did not find 'family' section in treeinfo") logging.debug("Did not find 'family' section in treeinfo")
return None return None
@@ -415,11 +419,13 @@ def _distroFromSUSEContent(fetcher, arch @@ -415,11 +420,13 @@ def _distroFromSUSEContent(fetcher, arch
# None if no content, GenericDistro if unknown label type. # None if no content, GenericDistro if unknown label type.
try: try:
cbuf = fetcher.acquireFileContent("content") cbuf = fetcher.acquireFileContent("content")
@ -489,7 +497,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
pbuf = pbuf.split(' ', 1)[1].strip() pbuf = pbuf.split(' ', 1)[1].strip()
# The media.1/products file naming convention changed between SLE11 and SLE12 # The media.1/products file naming convention changed between SLE11 and SLE12
if pbuf.startswith('SLE'): if pbuf.startswith('SLE'):
@@ -428,6 +434,7 @@ def _distroFromSUSEContent(fetcher, arch @@ -428,6 +435,7 @@ def _distroFromSUSEContent(fetcher, arch
cbuf = "\nDISTRO ," + pbuf.replace('-', ' ') cbuf = "\nDISTRO ," + pbuf.replace('-', ' ')
try: try:
bbuf = fetcher.acquireFileContent("media.1/build").split('-') bbuf = fetcher.acquireFileContent("media.1/build").split('-')
@ -497,7 +505,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
except: except:
bbuf = ["x86_64"] bbuf = ["x86_64"]
cbuf = cbuf + "\n" + " ".join(bbuf) cbuf = cbuf + "\n" + " ".join(bbuf)
@@ -647,7 +654,7 @@ class Distro(object): @@ -647,7 +655,7 @@ class Distro(object):
try: try:
kernelpath = self._getTreeinfoMedia("kernel") kernelpath = self._getTreeinfoMedia("kernel")
initrdpath = self._getTreeinfoMedia("initrd") initrdpath = self._getTreeinfoMedia("initrd")
@ -506,7 +514,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
pass pass
if not kernelpath or not initrdpath: if not kernelpath or not initrdpath:
@@ -714,6 +721,7 @@ class Distro(object): @@ -714,6 +722,7 @@ class Distro(object):
# Fetch 'filename' and return True/False if it matches the regex # Fetch 'filename' and return True/False if it matches the regex
try: try:
content = self.fetcher.acquireFileContent(filename) content = self.fetcher.acquireFileContent(filename)
@ -514,7 +522,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
except ValueError: except ValueError:
return False return False
@@ -783,15 +791,15 @@ class GenericDistro(Distro): @@ -783,15 +792,15 @@ class GenericDistro(Distro):
self._valid_kernel_path = ( self._valid_kernel_path = (
self._getTreeinfoMedia("kernel"), self._getTreeinfoMedia("kernel"),
self._getTreeinfoMedia("initrd")) self._getTreeinfoMedia("initrd"))
@ -533,7 +541,7 @@ Index: virt-manager-1.5.1/virtinst/urlfetcher.py
logging.debug(e) logging.debug(e)
if self.type == "xen": if self.type == "xen":
@@ -1477,7 +1485,7 @@ class ALTLinuxDistro(Distro): @@ -1477,7 +1486,7 @@ class ALTLinuxDistro(Distro):
# Build list of all *Distro classes # Build list of all *Distro classes
def _build_distro_list(): def _build_distro_list():
allstores = [] allstores = []