rpms/dstat/devel dstat-0.6.7-int.patch,NONE,1.1 dstat.spec,1.7,1.8

[Radek Brich (rbrich)]

Author: rbrich

Update of /cvs/extras/rpms/dstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6526

Modified Files:
	dstat.spec 
Added Files:
	dstat-0.6.7-int.patch 
Log Message:
fix #439143, #439146

dstat-0.6.7-int.patch:

--- NEW FILE dstat-0.6.7-int.patch ---
diff -up dstat-0.6.7/dstat.int dstat-0.6.7/dstat
--- dstat-0.6.7/dstat.int	2008-02-26 01:03:29.000000000 +0100
+++ dstat-0.6.7/dstat	2008-03-27 13:01:49.000000000 +0100
@@ -798,7 +798,6 @@ class dstat_epoch(dstat):
 #   def show(self):
 #       return ansi['reset'] + ( '%10.2f' % self.val['epoch'] )
 
-### FIXME: Make total work as well
 class dstat_int(dstat):
     def __init__(self):
         self.name = 'interrupts'
@@ -845,13 +844,13 @@ class dstat_int(dstat):
         if op.intlist:
             list = op.intlist
         else:
-            list = self.discover + ['total']
+            list = self.discover
             for name in list:
                 if name in ('0', '1', '2', '8', 'NMI', 'LOC', 'MIS', 'CPU0'):
                     list.remove(name)
             if not op.full and len(list) > 3: list = list[-3:]
         for name in list:
-            if name in self.discover:
+            if name in self.discover + ['total']:
                 ret.append(name)
             elif name.lower() in self.intmap.keys():
                 ret.append(self.intmap[name.lower()])
@@ -862,9 +861,11 @@ class dstat_int(dstat):
             l = line.split()
             if not l or l[0] != 'intr': continue
             for name in self.vars:
-                self.cn2[name] = long(l[int(name) + 2])
-            self.cn2['total'] = self.cn2['total'] + long(l[int(name) + 2])
-        for name in self.vars + ['total']:
+                if name == 'total':
+                    self.cn2['total'] = long(l[1])
+                else:
+                    self.cn2[name] = long(l[int(name) + 2])
+        for name in self.vars:
             self.val[name] = (self.cn2[name] - self.cn1[name]) * 1.0 / tick
         if step == op.delay:
             self.cn1.update(self.cn2)


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dstat.spec	19 Mar 2008 17:09:29 -0000	1.7
+++ dstat.spec	27 Mar 2008 15:38:27 -0000	1.8
@@ -4,12 +4,13 @@
 Summary: Versatile resource statistics tool
 Name: dstat
 Version: 0.6.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
+Patch0: dstat-0.6.7-int.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .int
 
 %build
 # Make sure the docs are in unix format
@@ -63,6 +65,11 @@
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Thu Mar 27 2008 Radek Brich <rbrich at redhat.com> - 0.6.7-2
+- fixes for interrupt stats:
+  * traceback when called with unknown name of interrupt (bz#439143)
+  * allow '-I total' option (bz#439146)
+
 * Wed Mar 19 2008 Radek Brich <rbrich at redhat.com> - 0.6.7-1
 - Release 0.6.7
 - Drop upstream patches