Hello community, here is the log from the commit of package python-psutil for openSUSE:Factory checked in at 2020-01-31 23:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psutil (Old) and /work/SRC/openSUSE:Factory/.python-psutil.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psutil" Fri Jan 31 23:54:41 2020 rev:53 rq:768438 version:5.6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes 2019-12-07 15:21:44.203742525 +0100 +++ /work/SRC/openSUSE:Factory/.python-psutil.new.26092/python-psutil.changes 2020-01-31 23:55:09.179585099 +0100 @@ -1,0 +2,6 @@ +Wed Jan 29 16:58:27 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add pr_1665.patch: Future-proof disk_io_counters on Linux. Fixes + tests with Linux 5.5. + +------------------------------------------------------------------- New: ---- pr_1665.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psutil.spec ++++++ --- /var/tmp/diff_new_pack.dDI0YL/_old 2020-01-31 23:55:10.271585665 +0100 +++ /var/tmp/diff_new_pack.dDI0YL/_new 2020-01-31 23:55:10.271585665 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-psutil # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Patch1: skip-test-missing-warnings.patch Patch2: skip-flaky-i586.patch Patch3: skip-obs.patch +Patch4: pr_1665.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -59,6 +60,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Remove shebangs sed -i "1s/#!.*//" psutil/{__init__.py,_compat.py,_psbsd.py,_pslinux.py,_psosx.py,_psposix.py,_pssunos.py,_pswindows.py} ++++++ pr_1665.patch ++++++ >From df417c78f9b91fa19e3dd04645d584f572dac4de Mon Sep 17 00:00:00 2001 From: Mike Hommey <[email protected]> Date: Fri, 17 Jan 2020 10:27:04 +0900 Subject: [PATCH 1/2] Future-proof disk_ui_counters on Linux. Kernel 5.5 added 2 more fields to /proc/diskstats, requiring another change after the one for 4.18, which recently added 4 fields. At this point in time, the meaning of the existing fields is unlikely to change, and psutil is not using any of the newer ones. By considering 18 fields and more to have the current layout, psutil will continue to work as newer kernels add more fields. --- psutil/_pslinux.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index c681439d4..673475116 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -1066,6 +1066,7 @@ def read_procfs(): # "3 1 hda1 8 8 8 8" # 4.18+ has 4 fields added: # "3 0 hda 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0" + # 5.5 has 2 more fields. # See: # https://www.kernel.org/doc/Documentation/iostats.txt # https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats @@ -1080,7 +1081,7 @@ def read_procfs(): reads = int(fields[2]) (reads_merged, rbytes, rtime, writes, writes_merged, wbytes, wtime, _, busy_time, _) = map(int, fields[4:14]) - elif flen == 14 or flen == 18: + elif flen == 14 or flen >= 18 # Linux 2.6+, line referring to a disk name = fields[2] (reads, reads_merged, rbytes, rtime, writes, writes_merged, >From ae5532a70b653435adbf8c7e86c3baa0bd3f90dc Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola <[email protected]> Date: Fri, 17 Jan 2020 12:32:05 +0100 Subject: [PATCH 2/2] fix typo --- psutil/_pslinux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 673475116..d8f8ed5c8 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -1081,7 +1081,7 @@ def read_procfs(): reads = int(fields[2]) (reads_merged, rbytes, rtime, writes, writes_merged, wbytes, wtime, _, busy_time, _) = map(int, fields[4:14]) - elif flen == 14 or flen >= 18 + elif flen == 14 or flen >= 18: # Linux 2.6+, line referring to a disk name = fields[2] (reads, reads_merged, rbytes, rtime, writes, writes_merged,
