!33 [sync] PR-32: [sync] PR-30: fix repr(Error): PID was not shown if PID == 0

From: @openeuler-sync-bot 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001

0001-fix-repr-Error-PID-was-not-shown-if-PID-0.patch

@@ -0,0 +1,26 @@
+From d135e2c3a99bfd1bd01d1158ec31dbc8dc1c910f Mon Sep 17 00:00:00 2001
+From: Giampaolo Rodola <g.rodola@gmail.com>
+Date: Sat, 15 Jan 2022 22:21:39 +0100
+Subject: [PATCH] fix repr(Error): PID was not shown if PID == 0
+
+Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
+---
+ psutil/_common.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/psutil/_common.py b/psutil/_common.py
+index 1e33699c..c94a8378 100644
+--- a/psutil/_common.py
++++ b/psutil/_common.py
+@@ -289,7 +289,7 @@ class Error(Exception):
+             info = {}  # Python 2.6
+         for name in attrs:
+             value = getattr(self, name, None)
+-            if value:
++            if value is not None:
+                 info[name] = value
+         return info
+ 
+-- 
+2.39.0.windows.2
+

python-psutil.spec

@@ -1,12 +1,13 @@
 Name:           python-psutil
-Version:        5.4.3
+Version:        5.9.0
-Release:        7
+Release:        2
 Summary:        A library for retrieving information on running processes and system utilization in Python
 License:        BSD
 URL:            https://github.com/giampaolo/psutil
 Source0:        https://github.com/giampaolo/psutil/archive/release-%{version}.tar.gz#/psutil-%{version}.tar.gz
+Patch0001:      0001-fix-repr-Error-PID-was-not-shown-if-PID-0.patch
 
-BuildRequires:  gcc python2-devel python3-devel procps-ng python2-mock python3-mock python2-ipaddress
+BuildRequires:  gcc python3-devel procps-ng python3-mock
 
 %description
 psutil (process and system utilities) is a cross-platform library for retrieving information
@@ -15,18 +16,6 @@ It is useful mainly for system monitoring, profiling and limiting process resour
 management of running processes.It implements many functionalities offered by classic UNIX
 command line tools such as ps, top, iotop, lsof, netstat, ifconfig, free and others.
 
-%package   -n   python2-psutil
-Summary:        A library for retrieving information on running processes and system utilization in Python2
-%{?python_provide:%python_provide python2-psutil}
-Obsoletes:      python-psutil < 3.1.1-3
-
-%description -n python2-psutil
-psutil (process and system utilities) is a cross-platform library for retrieving information
-on running processes and system utilization (CPU, memory, disks, network, sensors) in Python2.
-It is useful mainly for system monitoring, profiling and limiting process resources and
-management of running processes.It implements many functionalities offered by classic UNIX
-command line tools such as ps, top, iotop, lsof, netstat, ifconfig, free and others.
-
 %package   -n   python3-psutil
 Summary:        A library for retrieving information on running processes and system utilization in Python3
 %{?python_provide:%python_provide python3-psutil}
@@ -48,19 +37,11 @@ find psutil -name \*.py | while read file; do
 done
 
 %build
-%py2_build
 %py3_build
 
 %install
-%py2_install
 %py3_install
 
-%files -n python2-psutil
-%license LICENSE
-%doc CREDITS HISTORY.rst README.rst
-%{python2_sitearch}/psutil/
-%{python2_sitearch}/*.egg-info
-
 %files -n python3-psutil
 %license LICENSE
 %doc CREDITS HISTORY.rst README.rst
@@ -68,5 +49,17 @@ done
 %{python3_sitearch}/*.egg-info
 
 %changelog
+* Thu Oct 19 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 5.9.0-2
+- fix repr(Error): PID was not shown if PID == 0
+
+* Mon Jun 13 2022 OpenStack_SIG <openstack@openeuler.org> - 5.9.0-1
+- Update version to 5.9.0
+
+* Thu Jul 15 2021 OpenStack_SIG <openstack@openeuler.org> - 5.8.0-1
+- Update version to 5.8.0
+
+* Wed Aug 05 2020 lingsheng <lingsheng@huawei.com> - 5.4.3-8
+- Remove python2-psutil subpackage
+
 * Sat Nov 23 2019 zhouyihang <zhouyihang1@huawei.com> - 5.4.3-7
 - Package init

python-psutil.yaml

@@ -1,5 +1,5 @@
 git_url: https://github.com/giampaolo/psutil.git
 version_control: github
 src_repo:  giampaolo/psutil
-tag_prefix: "resease-"
+tag_prefix: "release-"
 seperator: "."