[iotop/el5/master] add missing patch

Michal Hlavinka mhlavink at fedoraproject.org
Tue Oct 12 07:49:47 UTC 2010


commit 94fd088e293b6417f4b25461a9e343792344c2a8
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Oct 12 09:49:54 2010 +0200

    add missing patch

 iotop-0.4.1-kercheck.patch |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/iotop-0.4.1-kercheck.patch b/iotop-0.4.1-kercheck.patch
new file mode 100644
index 0000000..ad2f330
--- /dev/null
+++ b/iotop-0.4.1-kercheck.patch
@@ -0,0 +1,18 @@
+diff -up iotop-0.4.1/iotop/data.py.kercheck iotop-0.4.1/iotop/data.py
+--- iotop-0.4.1/iotop/data.py.kercheck	2010-10-12 09:34:22.590236803 +0200
++++ iotop-0.4.1/iotop/data.py	2010-10-12 09:34:50.114434429 +0200
+@@ -366,7 +366,13 @@ class ProcessList(DumpableObject):
+         self.vmstat = vmstat.VmStat()
+ 
+         # A first time as we are interested in the delta
+-        self.update_process_counts()
++        try:
++            self.update_process_counts()
++        except OSError, exc:
++            (kver,krel)=os.uname()[2].split('-')
++            if kver == '2.6.18' and int(krel.split('.')[0]) < 199:
++                sys.exit("iotop requires kernel-2.6.18-199.el5 or later, but kernel-%s-%s is running" % (kver,krel))
++            raise exc
+ 
+     def get_process(self, pid):
+         """Either get the specified PID from self.processes or build a new


More information about the scm-commits mailing list