From e8f36f8c9d58ce4e814e2f5a1523858889c28f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Tue, 16 Jan 2018 11:57:12 +0000 Subject: [PATCH] Accepting request 566387 from home:cbosdonnat:branches:Virtualization - Fix a python3 UnboundLocalError (bsc#1075622) c174b550-connection-Another-py3-exception-variable-fix.patch OBS-URL: https://build.opensuse.org/request/show/566387 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=401 --- ...n-Another-py3-exception-variable-fix.patch | 31 +++++++++++++++++++ virt-manager.changes | 6 ++++ virt-manager.spec | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 c174b550-connection-Another-py3-exception-variable-fix.patch diff --git a/c174b550-connection-Another-py3-exception-variable-fix.patch b/c174b550-connection-Another-py3-exception-variable-fix.patch new file mode 100644 index 00000000..81f3ffd6 --- /dev/null +++ b/c174b550-connection-Another-py3-exception-variable-fix.patch @@ -0,0 +1,31 @@ +From c174b5509f5007fb11e095df1c88fd6176789f4f Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Wed, 20 Dec 2017 14:15:56 -0500 +Subject: [virt-manager][PATCH] connection: Another py3 exception variable fix + +--- + virtManager/connection.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/virtManager/connection.py b/virtManager/connection.py +index f9da6677..43fa3eb5 100644 +--- a/virtManager/connection.py ++++ b/virtManager/connection.py +@@ -1030,11 +1030,13 @@ class vmmConnection(vmmGObject): + warnconsole = False + libvirt_error_code = None + libvirt_error_message = None ++ exc = None + + try: + self._backend.open(self._do_creds_password) + return True, None +- except Exception as exc: ++ except Exception as e: ++ exc = e + tb = "".join(traceback.format_exc()) + if isinstance(exc, libvirt.libvirtError): + # pylint: disable=no-member +-- +2.15.1 + diff --git a/virt-manager.changes b/virt-manager.changes index 3602609a..48de685f 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 16 10:15:04 UTC 2018 - cbosdonnat@suse.com + +- Fix a python3 UnboundLocalError (bsc#1075622) + c174b550-connection-Another-py3-exception-variable-fix.patch + ------------------------------------------------------------------- Fri Jan 5 14:23:21 MST 2018 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 34605924..8ba6519c 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -73,6 +73,7 @@ Patch32: b9bc3b60-undefine-only-persistent-domain.patch Patch33: 7fc7e94f-fix-virtio-scsi-controller-target-calculation.patch Patch34: 2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch Patch35: f836e47b-virtinst-Fix-URLFetcher-for-reading-files.patch +Patch36: c174b550-connection-Another-py3-exception-variable-fix.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -253,6 +254,7 @@ machine). %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 # SUSE Only %patch70 -p1 %patch71 -p1