summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Jason Graham <jgraha8@gmail.com>2018-08-18 23:33:11 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2018-09-01 07:32:23 +0700
commitc0f615fb375942d05dd8316150cc082ec7f2b966 (patch)
treea7c7d9a0f1ce60944e92c4ece045a11f8ddc974b /system
parentd4ae7ef92e91546c54309fa0677735754b33f9fa (diff)
downloadslackbuilds-c0f615fb375942d05dd8316150cc082ec7f2b966.tar.gz
slackbuilds-c0f615fb375942d05dd8316150cc082ec7f2b966.tar.xz
system/iotop: Fix for iotop issue with 4.4.144 kernel
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/iotop/fix-proc-status-read.patch10
-rw-r--r--system/iotop/iotop.SlackBuild4
2 files changed, 13 insertions, 1 deletions
diff --git a/system/iotop/fix-proc-status-read.patch b/system/iotop/fix-proc-status-read.patch
new file mode 100644
index 0000000000..b88d8b274f
--- /dev/null
+++ b/system/iotop/fix-proc-status-read.patch
@@ -0,0 +1,10 @@
+--- iotop-0.6.orig/iotop/data.py 2013-05-26 18:44:18.000000000 -0400
++++ iotop-0.6/iotop/data.py 2018-08-18 23:21:03.528110821 -0400
+@@ -193,6 +193,7 @@
+ result_dict = {}
+ try:
+ for line in open('/proc/%d/status' % pid):
++ if not line.strip(): continue
+ key, value = line.split(':\t', 1)
+ result_dict[key] = value.strip()
+ except IOError:
diff --git a/system/iotop/iotop.SlackBuild b/system/iotop/iotop.SlackBuild
index 2516bf1d43..e2c8327557 100644
--- a/system/iotop/iotop.SlackBuild
+++ b/system/iotop/iotop.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=iotop
VERSION=${VERSION:-0.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -55,6 +55,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/fix-proc-status-read.patch
+
sed -i 's|share/man/man8|man/man8|' setup.py
python setup.py install --root=$PKG