|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool.spec
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:PR1.patch
^
|
| @@ -1,13 +0,0 @@
-diff --git a/dool b/dool
-index ff509c5..5f076f6 100755
---- a/dool
-+++ b/dool
-@@ -810,7 +810,7 @@ class dool_disk(dstat):
- ret = []
- for l in self.splitlines():
- if len(l) < 13: continue
-- if l[3:] == ['0',] * 11: continue
-+ if l[3:] == ['0',] * (len(l) - 3): continue
- name = l[2]
- ret.append(name)
- for item in objlist: ret.append(item)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:PR2.patch
^
|
| @@ -1,36 +0,0 @@
-From 08b3fcf8426d2e00593eb1eaab049b5da7129e04 Mon Sep 17 00:00:00 2001
-From: Christian Grigis <christian.grigis@epfl.ch>
-Date: Thu, 15 Oct 2020 13:43:54 +0200
-Subject: [PATCH] Fix syntax errors
-
----
- plugins/dool_mysql_keys.py | 2 +-
- plugins/dool_squid.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/dool_mysql_keys.py b/plugins/dool_mysql_keys.py
-index 763e3cb..640a830 100644
---- a/plugins/dool_mysql_keys.py
-+++ b/plugins/dool_mysql_keys.py
-@@ -38,7 +38,7 @@ def extract(self):
- for name in self.vars: self.val[name] = -1
-
- except Exception as e:
-- if op.debug > 1: print('%s: exception' (self.filename, e))
-+ if op.debug > 1: print('%s: exception %s' % (self.filename, e))
- for name in self.vars: self.val[name] = -1
-
- # vim:ts=4:sw=4:et
-diff --git a/plugins/dool_squid.py b/plugins/dool_squid.py
-index c864cf5..7e8f535 100644
---- a/plugins/dool_squid.py
-+++ b/plugins/dool_squid.py
-@@ -45,7 +45,7 @@ def extract(self):
- if op.debug > 1: print('%s: lost pipe to squidclient, %s' % (self.filename, e))
- for name in self.vars: self.val[name] = -1
- except Exception as e:
-- if op.debug > 1: print('%s: exception' (self.filename, e))
-+ if op.debug > 1: print('%s: exception %s' % (self.filename, e))
- for name in self.vars: self.val[name] = -1
-
- # vim:ts=4:sw=4:et
|
|
[-]
[+]
|
Deleted |
_service:tar_git:PR22.patch
^
|
| @@ -1,27 +0,0 @@
-diff --git a/plugins/dool_top_mem.py b/plugins/dool_top_mem.py
-index 1fdabca..23e856e 100644
---- a/plugins/dool_top_mem.py
-+++ b/plugins/dool_top_mem.py
-@@ -20,18 +20,18 @@ def extract(self):
- for pid in proc_pidlist():
- try:
- ### Using dopen() will cause too many open files
-- l = proc_splitline('/proc/%s/stat' % pid)
-+ l = proc_splitline('/proc/%s/statm' % pid)
- except IOError:
- continue
-
-- if len(l) < 23: continue
-- usage = int(l[23]) * pagesize
-+ if len(l) < 2: continue
-+ usage = int(l[1]) * pagesize
-
- ### Is it a new topper ?
- if usage <= self.val['max']: continue
-
- self.val['max'] = usage
-- self.val['name'] = getnamebypid(pid, l[1][1:-1])
-+ self.val['name'] = getnamebypid(pid, proc_splitline('/proc/%s/comm' % pid)[0:-1])
- self.val['pid'] = pid
-
- self.output = '%-*s%s' % (self.width-5, self.val['name'][0:self.width-5], cprint(self.val['max'], 'f', 5, 1024))
|
|
|
Renamed |
_service:tar_git:harbour-dool-1.3.1+obs2.tar.gz
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-dool.yaml
^
|
| @@ -7,10 +7,6 @@
License: GPLv2
Sources:
- '%{name}-%{version}.tar.gz'
-Patches:
- # PR1.patch # for 1.1.0
- # PR2.patch # for 1.1.0
- - PR22.patch
Description: |
Dool is a Python3 compatible clone of Dstat.
After Dag Wieers ceased development of Dstat scottchiefbaker forked the
|
