From 0b2909e81b3f5818c73c82c5b808fed213319dc4 Mon Sep 17 00:00:00 2001 From: yezengruan Date: Thu, 11 Aug 2022 19:26:42 +0800 Subject: [PATCH] apibuild: Fix self.waring method call Signed-off-by: yezengruan (cherry picked from commit a840bbd208b8d2eeec4632f1fbb4ad16f5a12973) --- apibuild-Fix-self.waring-method-call.patch | 31 ++++++++++++++++++++++ libvirt.spec | 6 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 apibuild-Fix-self.waring-method-call.patch diff --git a/apibuild-Fix-self.waring-method-call.patch b/apibuild-Fix-self.waring-method-call.patch new file mode 100644 index 0000000..97ccecc --- /dev/null +++ b/apibuild-Fix-self.waring-method-call.patch @@ -0,0 +1,31 @@ +From 58d0830491d3be2fedec55f42f6f832d32783a73 Mon Sep 17 00:00:00 2001 +From: luzhipeng +Date: Sat, 7 May 2022 09:17:31 +0800 +Subject: [PATCH] apibuild: Fix self.waring method call + +The parameters of self.warning is inconsistent with its definition, So +fix it. + +Signed-off-by: dinglimin +Signed-off-by: luzhipeng +Reviewed-by: Martin Kletzander +--- + scripts/apibuild.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/apibuild.py b/scripts/apibuild.py +index 05a169c30d..c98bcf6091 100755 +--- a/scripts/apibuild.py ++++ b/scripts/apibuild.py +@@ -315,7 +315,7 @@ class index: + if type in type_map: + type_map[type][name] = d + else: +- self.warning("Unable to register type ", type) ++ self.warning("Unable to register type %s" % type) + + if name == debugsym and not quiet: + print("New symbol: %s" % (d)) +-- +2.27.0 + diff --git a/libvirt.spec b/libvirt.spec index 65f3309..8433457 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 40 +Release: 41 License: LGPLv2+ URL: https://libvirt.org/ @@ -250,6 +250,7 @@ Patch0137: virsh-Display-vhostuser-socket-path-in-domblklist.patch Patch0138: sw_64-Add-sw64-architecture-support.patch Patch0139: src-workaround-warning-triggered-in-glib-2.69.patch Patch0140: nwfilter-fix-crash-when-counting-number-of-network-f.patch +Patch0141: apibuild-Fix-self.waring-method-call.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1984,6 +1985,9 @@ exit 0 %changelog +* Thu Aug 11 2022 yezengruan - 6.2.0-41 +- apibuild: Fix self.waring method call + * Mon Jun 20 2022 yezengruan - 6.2.0-40 - nwfilter: fix crash when counting number of network filters (CVE-2022-0897) -- Gitee