Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-psutil for openSUSE:Factory
checked in at 2022-06-25 10:23:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-psutil (Old)
and /work/SRC/openSUSE:Factory/.python-psutil.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psutil"
Sat Jun 25 10:23:45 2022 rev:66 rq:984765 version:5.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes
2022-05-26 18:43:44.757155982 +0200
+++ /work/SRC/openSUSE:Factory/.python-psutil.new.1548/python-psutil.changes
2022-06-25 10:23:48.390634716 +0200
@@ -1,0 +2,6 @@
+Thu Jun 23 11:09:31 UTC 2022 - Dr. Werner Fink <wer...@suse.de>
+
+- Add patch mem-used-bsc1181475.patch (bsc#1181475)
+ * Adopt change of used memory calculation from upstream of procps
+
+-------------------------------------------------------------------
New:
----
mem-used-bsc1181475.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-psutil.spec ++++++
--- /var/tmp/diff_new_pack.zIzWBv/_old 2022-06-25 10:23:48.846635367 +0200
+++ /var/tmp/diff_new_pack.zIzWBv/_new 2022-06-25 10:23:48.850635373 +0200
@@ -36,6 +36,8 @@
Patch2: skip_failing_tests.patch
# PATCH-FIX-SLE skip_rlimit_tests_on_python2.patch alarr...@suse.com
Patch3: skip_rlimit_tests_on_python2.patch
+# PATCH-FIX-SLE adopt change of used memory of procps
+Patch4: mem-used-bsc1181475.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
++++++ mem-used-bsc1181475.patch ++++++
---
psutil/_pslinux.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py 2022-06-23 09:43:10.973822573 +0000
@@ -473,12 +473,6 @@ def virtual_memory():
except KeyError:
slab = 0
- used = total - free - cached - buffers
- if used < 0:
- # May be symptomatic of running within a LCX container where such
- # values will be dramatically distorted over those of the host.
- used = total - free
-
# - starting from 4.4.0 we match free's "available" column.
# Before 4.4.0 we calculated it as (free + buffers + cached)
# which matched htop.
@@ -503,6 +497,12 @@ def virtual_memory():
if avail > total:
avail = free
+ used = total - avail
+ if used < 0:
+ # May be symptomatic of running within a LCX container where such
+ # values will be dramatically distorted over those of the host.
+ used = total - free
+
percent = usage_percent((total - avail), total, round_=1)
# Warn about missing metrics which are set to 0.
