From 21fdeab0934ad21968aadd6dad8a598192bb7807 Mon Sep 17 00:00:00 2001 From: Cong Liu Date: Fri, 11 Nov 2022 16:30:14 +0800 Subject: [PATCH] format patches --- debian/patches/legacy-images.patch | 18 +++++++----- debian/patches/mark-libvirt-lxc.patch | 41 +++++++++++++++++---------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/debian/patches/legacy-images.patch b/debian/patches/legacy-images.patch index 0f6b65c4..4549827a 100644 --- a/debian/patches/legacy-images.patch +++ b/debian/patches/legacy-images.patch @@ -1,12 +1,16 @@ -Description: Fix legacy-images path for focal. -Author: Dimitri John Ledkov +From: Dimitri John Ledkov +Date: Fri, 11 Nov 2022 16:30:14 +0800 +Subject: Fix legacy-images path for focal. + Bug-Ubuntu: https://launchpad.net/bugs/1872941 +--- + virtinst/install/urldetect.py | 5 +++++ + 1 file changed, 5 insertions(+) - -Index: virt-manager-2.2.1/virtinst/install/urldetect.py -=================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.1/virtinst/install/urldetect.py +diff --git a/virtinst/install/urldetect.py b/virtinst/install/urldetect.py +index 7969ad4..decdf28 100644 +--- a/virtinst/install/urldetect.py ++++ b/virtinst/install/urldetect.py @@ -640,6 +640,8 @@ class _DebianDistro(_DistroTree): media_type = None if check_manifest("current/images/MANIFEST"): diff --git a/debian/patches/mark-libvirt-lxc.patch b/debian/patches/mark-libvirt-lxc.patch index cd978eda..4f0de775 100644 --- a/debian/patches/mark-libvirt-lxc.patch +++ b/debian/patches/mark-libvirt-lxc.patch @@ -1,24 +1,22 @@ -Description: Clearly mark the LXC connections as being libvirt-lxc, to - avoid confusion due to differing features and configurations. +From: Serge Hallyn +Date: Fri, 11 Nov 2022 16:30:14 +0800 +Subject: Clearly mark the LXC connections as being libvirt-lxc, to + Written: 2015-08-22 -Author: Serge Hallyn Updated: 2019-12-06 Forwarded: https://github.com/virt-manager/virt-manager/pull/67 ---- a/virtManager/createconn.py -+++ b/virtManager/createconn.py -@@ -171,7 +171,7 @@ class vmmConnect(vmmGObjectUI): - _add_hv_row(HV_QEMU, "qemu", "QEMU/KVM") - _add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session")) - _add_hv_row(HV_XEN, "xen", "Xen") -- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")") -+ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)") - _add_hv_row(HV_BHYVE, "bhyve", "Bhyve") - _add_hv_row(HV_VZ, "vz", "Virtuozzo") - _add_hv_row(-1, None, "") +avoid confusion due to differing features and configurations. +--- + virtManager/connection.py | 2 +- + virtManager/createconn.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/virtManager/connection.py b/virtManager/connection.py +index f6dc5f5..e1eb299 100644 --- a/virtManager/connection.py +++ b/virtManager/connection.py -@@ -433,7 +433,7 @@ class vmmConnection(vmmGObject): +@@ -390,7 +390,7 @@ class vmmConnection(vmmGObject): "esx": "ESX", "gsx": "GSX", "libxl": "libxl", @@ -27,3 +25,16 @@ Forwarded: https://github.com/virt-manager/virt-manager/pull/67 "openvz": "OpenVZ", "phyp": "phyp", "qemu": "QEMU/KVM", +diff --git a/virtManager/createconn.py b/virtManager/createconn.py +index d30ee09..470e246 100644 +--- a/virtManager/createconn.py ++++ b/virtManager/createconn.py +@@ -116,7 +116,7 @@ class vmmCreateConn(vmmGObjectUI): + _add_hv_row(HV_QEMU, "qemu", "QEMU/KVM") + _add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session")) + _add_hv_row(HV_XEN, "xen", "Xen") +- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")") ++ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)") + _add_hv_row(HV_BHYVE, "bhyve", "Bhyve") + _add_hv_row(HV_VZ, "vz", "Virtuozzo") + _add_hv_row(-1, None, "")