diff --git a/Fix-string-formatting.patch b/Fix-string-formatting.patch new file mode 100644 index 0000000000000000000000000000000000000000..605dda6a595c68a8b581c6a520023a0783260639 --- /dev/null +++ b/Fix-string-formatting.patch @@ -0,0 +1,28 @@ +From a24c9df52ce15f7ad5742e0693ef6108d7a2ea10 Mon Sep 17 00:00:00 2001 +From: qihao_yewu +Date: Thu, 24 Nov 2022 19:59:54 +0800 +Subject: [PATCH] generator: Fix string formatting + +remove excessive arguments. + +Signed-off-by: Philipp Hahn +Signed-off-by: qihao_yewu +--- + 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 diff --git a/Fix-the-invalid-operation-between-incompatible-types.patch b/Fix-the-invalid-operation-between-incompatible-types.patch new file mode 100644 index 0000000000000000000000000000000000000000..556e0931e7f631bd6c31fec5c4db6003b907aa0b --- /dev/null +++ b/Fix-the-invalid-operation-between-incompatible-types.patch @@ -0,0 +1,27 @@ +From 787c5e56deede97ede263c104c2e7c54af922d39 Mon Sep 17 00:00:00 2001 +From: qihao_yewu +Date: Thu, 24 Nov 2022 19:54:14 +0800 +Subject: [PATCH] Fix the invalid "+" operation between incompatible types + +Change the ending position of parentheses. + +Signed-off-by: qihao_yewu +--- + examples/guest-vcpus/guest-vcpu-daemon.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/guest-vcpus/guest-vcpu-daemon.py b/examples/guest-vcpus/guest-vcpu-daemon.py +index 30fcb9c..211e9d4 100755 +--- a/examples/guest-vcpus/guest-vcpu-daemon.py ++++ b/examples/guest-vcpus/guest-vcpu-daemon.py +@@ -103,7 +103,7 @@ def work(): + try: + conn = libvirt.open(uri) + except: +- print('Failed to connect to ' + uri + ', retry in ' + str(connectRetryTimeout)) + ' seconds' ++ print('Failed to connect to ' + uri + ', retry in ' + str(connectRetryTimeout) + ' seconds') + time.sleep(connectRetryTimeout) + continue + +-- +2.18.2 diff --git a/libvirt-python.spec b/libvirt-python.spec index 402383eccccda037d5d2372f5dbc3c3b0e3bbc73..6c66a4f2c7f9bb6586f3eabb2c1ce59876a7de2f 100644 --- a/libvirt-python.spec +++ b/libvirt-python.spec @@ -3,7 +3,7 @@ Summary: The libvirt virtualization API python3 binding Name: libvirt-python Version: 6.2.0 -Release: 3 +Release: 5 Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Patch0000: setup-use-pytest-instead-of-nose-to-run-the-test-sui.patch Patch0001: spec-use-pytest-instead-of-nose.patch @@ -12,6 +12,8 @@ Patch0003: Fix-PY_SSIZE_T_CLEAN-deprecation-warning.patch Patch0004: Avoid-use-of-thread-function-deprecated-in-3.9.patch Patch0005: Replace-deprecated-PyEval_CallObject-with-PyObject_C.patch Patch0006: Avoid-truncating-python-version-number-when-running-.patch +Patch0007: Fix-the-invalid-operation-between-incompatible-types.patch +Patch0008: Fix-string-formatting.patch Url: http://libvirt.org License: LGPLv2+ BuildRequires: libvirt-devel == %{version} @@ -76,6 +78,12 @@ find examples -type f -exec chmod 0644 \{\} \; %{python3_sitearch}/*egg-info %changelog +* Tue Nov 29 2022 Qi Hao - 6.2.0-5 +- generator: Fix string formatting + +* Fri Nov 25 2022 Qi Hao - 6.2.0-4 +- Fix the invalid "+" operation between incompatible types + * Tue Mar 29 2022 yezengruan - 6.2.0-3 - Avoid truncating python version number when running sanity test