generator: Fix string formatting

cheery-pick from d2de75dd838801ef47c834f91c9f8ef5ed892d29

remove excessive arguments.

Signed-off-by: Philipp Hahn <hahn@univention.de>
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
This commit is contained in:
qihao_yewu 2022-11-25 09:56:10 +08:00
parent 32e64efd99
commit f7a756951d
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From a24c9df52ce15f7ad5742e0693ef6108d7a2ea10 Mon Sep 17 00:00:00 2001
From: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
Date: Thu, 24 Nov 2022 19:59:54 +0800
Subject: [PATCH] generator: Fix string formatting
remove excessive arguments.
Signed-off-by: Philipp Hahn <hahn@univention.de>
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
---
generator.py | 2 +----
1 file changed, 1 insertion(+), 1 deletions(-)
diff --git a/generator.py b/generator.py
index 426f007..5e89136 100755
--- a/generator.py
+++ b/generator.py
@@ -766,7 +766,7 @@ def print_function_wrapper(module, name, output, export, include):
if file == "python_accessor":
if args[1][1] == "char *":
c_call = "\n VIR_FREE(%s->%s);\n" % (
- args[0][0], args[1][0], args[0][0], args[1][0])
+ args[0][0], args[1][0])
c_call = c_call + " %s->%s = (%s)strdup((const xmlChar *)%s);\n" % (args[0][0],
args[1][0], args[1][1], args[1][0])
else:
--
2.18.2

View File

@ -3,7 +3,7 @@
Summary: The libvirt virtualization API python3 binding Summary: The libvirt virtualization API python3 binding
Name: libvirt-python Name: libvirt-python
Version: 6.2.0 Version: 6.2.0
Release: 4 Release: 5
Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz
Patch0000: setup-use-pytest-instead-of-nose-to-run-the-test-sui.patch Patch0000: setup-use-pytest-instead-of-nose-to-run-the-test-sui.patch
Patch0001: spec-use-pytest-instead-of-nose.patch Patch0001: spec-use-pytest-instead-of-nose.patch
@ -13,6 +13,7 @@ Patch0004: Avoid-use-of-thread-function-deprecated-in-3.9.patch
Patch0005: Replace-deprecated-PyEval_CallObject-with-PyObject_C.patch Patch0005: Replace-deprecated-PyEval_CallObject-with-PyObject_C.patch
Patch0006: Avoid-truncating-python-version-number-when-running-.patch Patch0006: Avoid-truncating-python-version-number-when-running-.patch
Patch0007: Fix-the-invalid-operation-between-incompatible-types.patch Patch0007: Fix-the-invalid-operation-between-incompatible-types.patch
Patch0008: Fix-string-formatting.patch
Url: http://libvirt.org Url: http://libvirt.org
License: LGPLv2+ License: LGPLv2+
BuildRequires: libvirt-devel == %{version} BuildRequires: libvirt-devel == %{version}
@ -77,6 +78,9 @@ find examples -type f -exec chmod 0644 \{\} \;
%{python3_sitearch}/*egg-info %{python3_sitearch}/*egg-info
%changelog %changelog
* Tue Nov 29 2022 Qi Hao <qihao_yewu@cmss.chinamobile.com> - 6.2.0-5
- generator: Fix string formatting
* Fri Nov 25 2022 Qi Hao <qihao_yewu@cmss.chinamobile.com> - 6.2.0-4 * Fri Nov 25 2022 Qi Hao <qihao_yewu@cmss.chinamobile.com> - 6.2.0-4
- Fix the invalid "+" operation between incompatible types - Fix the invalid "+" operation between incompatible types