From b36e814a7b59b417a065da2121668962bf12596d Mon Sep 17 00:00:00 2001 From: tong_1001 Date: Wed, 2 Sep 2020 10:50:36 +0800 Subject: [PATCH] fix import of utilist --- backport-Fix-import-of-utilist.patch | 31 ++++++++++++++++++++++++++++ python-linux-procfs.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-import-of-utilist.patch diff --git a/backport-Fix-import-of-utilist.patch b/backport-Fix-import-of-utilist.patch new file mode 100644 index 0000000..7458cc2 --- /dev/null +++ b/backport-Fix-import-of-utilist.patch @@ -0,0 +1,31 @@ +From 208b963455fa5ff658b24e513639f27ef66920ce Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Wed, 2 Sep 2020 09:32:30 +0800 +Subject: [PATCH] Fix import of utilist + +reason:If procfs/utilist.py is not in your PYTHONPATH, the import can fail. +Specify it fully. + +Signed-off-by: John Kacur + +https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/+/208b963455fa5ff658b24e513639f27ef66920ce%5E%21/ +--- + procfs/procfs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/procfs/procfs.py b/procfs/procfs.py +index a586ae2..3cfa941 100755 +--- a/procfs/procfs.py ++++ b/procfs/procfs.py +@@ -21,7 +21,7 @@ + import os, time + from functools import reduce + from six.moves import range +-from utilist import bitmasklist ++from procfs.utilist import bitmasklist + import platform + import re + +-- +2.19.1 + diff --git a/python-linux-procfs.spec b/python-linux-procfs.spec index 9ff0a43..2aea563 100644 --- a/python-linux-procfs.spec +++ b/python-linux-procfs.spec @@ -3,7 +3,7 @@ Python classes to extract information from the Linux kernel /proc files. Name: python-linux-procfs Version: 0.6.2 -Release: 1 +Release: 2 Summary: Linux /proc abstraction classes License: GPLv2 URL: https://rt.wiki.kernel.org/index.php/Tuna @@ -12,6 +12,8 @@ BuildArch: noarch BuildRequires: python2-devel python2-setuptools BuildRequires: python3-devel python3-setuptools +Patch0: backport-Fix-import-of-utilist.patch + %description %_description %package -n python2-linux-procfs @@ -56,6 +58,9 @@ Requires: python3-six %license COPYING %changelog +* Wed Sep 02 2020 xinghe - 0.6.2-2 +- fix import of utilist + * Fri Jul 24 2020 tianwei - 0.6.2-1 - Type:enhancement - ID:NA