- Fix exception when selecting ISO for install source.

virtman-autoyast-label.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=120
This commit is contained in:
Charles Arnold 2013-07-17 21:21:42 +00:00 committed by Git OBS Bridge
parent a0ee59eff0
commit b822a131f8
3 changed files with 27 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 17 14:48:48 MDT 2013 - carnold@suse.com
- Fix exception when selecting ISO for install source.
virtman-autoyast-label.patch
-------------------------------------------------------------------
Wed Jul 3 14:52:48 MDT 2013 - carnold@suse.com

View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define gsysconfdir /etc
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0

View File

@ -2,7 +2,7 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
===================================================================
--- virt-manager-0.9.5.orig/src/virtManager/create.py
+++ virt-manager-0.9.5/src/virtManager/create.py
@@ -1248,12 +1248,25 @@ class vmmCreate(vmmGObjectUI):
@@ -1248,12 +1248,26 @@ class vmmCreate(vmmGObjectUI):
variant = self.widget("install-os-version")
variant.set_active(0)
@ -10,12 +10,13 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
+ # Update label based on os version selected to either kickstart vs autoyast
+ combo = self.widget("install-os-version")
+ if combo.get_active() != -1:
+ ver = combo.get_active_text()
+ os_ver = combo.get_active_text()
+ label = self.widget("kickstart-url-label")
+ if ver.startswith('opensuse') or ver.startswith('sle') or ver.startswith('oes'):
+ label.set_text("AutoYaST file:")
+ else:
+ label.set_text("Kickstart URL:")
+ if label and os_ver:
+ if os_ver.startswith('opensuse') or os_ver.startswith('sle') or os_ver.startswith('oes'):
+ label.set_text("AutoYaST file:")
+ else:
+ label.set_text("Kickstart URL:")
+
def change_os_version(self, box):
model = box.get_model()
@ -28,7 +29,7 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
# Get previous
os_type_list = self.widget("install-os-type")
os_type_model = os_type_list.get_model()
@@ -2116,6 +2129,7 @@ class vmmCreate(vmmGObjectUI):
@@ -2116,6 +2130,7 @@ class vmmCreate(vmmGObjectUI):
dl = self.set_os_val(self.widget("install-os-type"), distro)
vl = self.set_os_val(self.widget("install-os-version"), ver)
self.set_distro_labels(dl, vl)
@ -36,3 +37,16 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
def check_detection(self, idx, forward):
results = None
Index: virt-manager-0.9.5/src/vmm-create.ui
===================================================================
--- virt-manager-0.9.5.orig/src/vmm-create.ui
+++ virt-manager-0.9.5/src/vmm-create.ui
@@ -807,7 +807,7 @@
<property name="column_spacing">6</property>
<property name="row_spacing">4</property>
<child>
- <object class="GtkLabel" id="label25">
+ <object class="GtkLabel" id="kickstart-url-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>