ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
93 lines
2.9 KiB
Diff
93 lines
2.9 KiB
Diff
Subject: virtconv: Don't implicitly depend on dict hash order
|
|
From: Cole Robinson crobinso@redhat.com Fri Oct 20 16:06:48 2017 -0400
|
|
Date: Fri Oct 20 16:13:04 2017 -0400:
|
|
Git: d2648d81cc8a9c1ddb7e19b8fe44edaf53ad67ab
|
|
|
|
|
|
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 4cad0203..60055b7d 100644
|
|
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
|
|
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
|
|
@@ -6,7 +6,6 @@
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch="x86_64">hvm</type>
|
|
- <boot dev="cdrom"/>
|
|
<boot dev="hd"/>
|
|
</os>
|
|
<features>
|
|
@@ -28,15 +27,15 @@
|
|
</pm>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-kvm</emulator>
|
|
- <disk type="file" device="cdrom">
|
|
- <driver type="raw"/>
|
|
- <target dev="hda" bus="ide"/>
|
|
- <readonly/>
|
|
- </disk>
|
|
<disk type="file" device="disk">
|
|
<driver name="qemu"/>
|
|
<source file="/var/lib/libvirt/images/MS-DOS"/>
|
|
+ <target dev="hda" bus="ide"/>
|
|
+ </disk>
|
|
+ <disk type="file" device="cdrom">
|
|
+ <driver type="raw"/>
|
|
<target dev="hdb" bus="ide"/>
|
|
+ <readonly/>
|
|
</disk>
|
|
<controller type="usb" index="0" model="ich9-ehci1"/>
|
|
<controller type="usb" index="0" model="ich9-uhci1">
|
|
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
|
|
index 803a7424..e72a7184 100644
|
|
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
|
|
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
|
|
@@ -6,7 +6,6 @@
|
|
<vcpu>2</vcpu>
|
|
<os>
|
|
<type arch="x86_64">hvm</type>
|
|
- <boot dev="cdrom"/>
|
|
<boot dev="hd"/>
|
|
</os>
|
|
<features>
|
|
@@ -28,15 +27,15 @@
|
|
</pm>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-kvm</emulator>
|
|
- <disk type="file" device="cdrom">
|
|
- <target dev="hda" bus="ide"/>
|
|
- <readonly/>
|
|
- </disk>
|
|
<disk type="file" device="disk">
|
|
<driver name="qemu"/>
|
|
<source file="/var/lib/libvirt/images/ESX4.0-rhel4u8-32b-flat"/>
|
|
<target dev="sda" bus="scsi"/>
|
|
</disk>
|
|
+ <disk type="file" device="cdrom">
|
|
+ <target dev="hda" bus="ide"/>
|
|
+ <readonly/>
|
|
+ </disk>
|
|
<controller type="usb" index="0" model="ich9-ehci1"/>
|
|
<controller type="usb" index="0" model="ich9-uhci1">
|
|
<master startport="0"/>
|
|
diff --git a/virtconv/vmx.py b/virtconv/vmx.py
|
|
index fc6a5264..3be19e5c 100644
|
|
--- a/virtconv/vmx.py
|
|
+++ b/virtconv/vmx.py
|
|
@@ -19,6 +19,7 @@
|
|
# MA 02110-1301 USA.
|
|
#
|
|
|
|
+import collections
|
|
import logging
|
|
import os
|
|
import re
|
|
@@ -88,7 +89,7 @@ class _VMXFile(object):
|
|
(len(self.lines) + 1, line.strip(), e))
|
|
|
|
def pairs(self):
|
|
- ret = {}
|
|
+ ret = collections.OrderedDict()
|
|
for line in self.lines:
|
|
if line.pair:
|
|
ret[line.pair[0]] = line.pair[1]
|