- bsc#947129 - Error launching manager: 'URI' is not in list
virtman-show-suse-install-repos.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=270
This commit is contained in:
parent
2e04f0d659
commit
bbb1fd73ef
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 23 10:25:33 MDT 2015 - carnold@suse.com
|
||||
|
||||
- bsc#947129 - Error launching manager: 'URI' is not in list
|
||||
virtman-show-suse-install-repos.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 22 11:07:01 MDT 2015 - carnold@suse.com
|
||||
|
||||
|
@ -9,7 +9,7 @@ Index: virt-manager-1.2.1/virtinst/util.py
|
||||
===================================================================
|
||||
--- virt-manager-1.2.1.orig/virtinst/util.py
|
||||
+++ virt-manager-1.2.1/virtinst/util.py
|
||||
@@ -559,3 +559,22 @@ def getInstallRepos(enabled_sources_only
|
||||
@@ -558,3 +558,22 @@ def getInstallRepos(enabled_sources_only
|
||||
zypper_output.insert(0, dom0_inst_source)
|
||||
return (index_dom0, zypper_output)
|
||||
|
||||
|
@ -2,10 +2,10 @@ Enhancement that gets the hosts installation location from
|
||||
install.inf and also collects the repos provided by zypper.
|
||||
These locations are then presented as potential installation
|
||||
locations when createing a VM.
|
||||
Index: virt-manager-1.2.0/virtManager/create.py
|
||||
Index: virt-manager-1.2.1/virtManager/create.py
|
||||
===================================================================
|
||||
--- virt-manager-1.2.0.orig/virtManager/create.py
|
||||
+++ virt-manager-1.2.0/virtManager/create.py
|
||||
--- virt-manager-1.2.1.orig/virtManager/create.py
|
||||
+++ virt-manager-1.2.1/virtManager/create.py
|
||||
@@ -359,7 +359,13 @@ class vmmCreate(vmmGObjectUI):
|
||||
self.widget("install-url-options").set_expanded(False)
|
||||
urlmodel = self.widget("install-url-box").get_model()
|
||||
@ -21,10 +21,10 @@ Index: virt-manager-1.2.0/virtManager/create.py
|
||||
self.populate_media_model(ksmodel, self.config.get_kickstart_urls())
|
||||
self.set_distro_labels("-", "-", force=True)
|
||||
|
||||
Index: virt-manager-1.2.0/virtinst/util.py
|
||||
Index: virt-manager-1.2.1/virtinst/util.py
|
||||
===================================================================
|
||||
--- virt-manager-1.2.0.orig/virtinst/util.py
|
||||
+++ virt-manager-1.2.0/virtinst/util.py
|
||||
--- virt-manager-1.2.1.orig/virtinst/util.py
|
||||
+++ virt-manager-1.2.1/virtinst/util.py
|
||||
@@ -23,11 +23,14 @@ import os
|
||||
import random
|
||||
import re
|
||||
@ -40,7 +40,7 @@ Index: virt-manager-1.2.0/virtinst/util.py
|
||||
|
||||
|
||||
def listify(l):
|
||||
@@ -462,3 +465,97 @@ def register_libvirt_error_handler():
|
||||
@@ -462,3 +465,96 @@ def register_libvirt_error_handler():
|
||||
ignore = userdata
|
||||
ignore = err
|
||||
libvirt.registerErrorHandler(f=libvirt_callback, ctx=None)
|
||||
@ -111,15 +111,14 @@ Index: virt-manager-1.2.0/virtinst/util.py
|
||||
+ p = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE)
|
||||
+ stdout, stderr = p.communicate()
|
||||
+ zypper_output = stdout
|
||||
+ zypper_list = zypper_output.split("\n")
|
||||
+ zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")]
|
||||
+ uri_index = zypper_header.index("URI")
|
||||
+ except:
|
||||
+ if dom0_inst_source is None:
|
||||
+ dom0_inst_source = []
|
||||
+ return (0, dom0_inst_source)
|
||||
+
|
||||
+ zypper_list = zypper_output.split("\n")
|
||||
+ zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")]
|
||||
+ uri_index = zypper_header.index("URI")
|
||||
+
|
||||
+ index_dom0 = -1
|
||||
+ number_of_sources = 0
|
||||
+ zypper_output = []
|
||||
|
Loading…
Reference in New Issue
Block a user