rpms/dstat/devel dstat-0.6.7-dbus.patch, NONE, 1.1 dstat.spec, 1.8, 1.9
Radek Brich (rbrich)
fedora-extras-commits at redhat.com
Fri Apr 25 11:27:01 UTC 2008
- Previous message (by thread): rpms/gd/F-8 gd.spec,1.46,1.47
- Next message (by thread): rpms/tree/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tree-1.2-carrot.patch, 1.1, 1.2 tree-1.2-colour.patch, 1.3, 1.4 tree-1.2-no-strip.patch, 1.3, 1.4 tree-preserve-timestamps.patch, 1.1, 1.2 tree.spec, 1.26, 1.27 tree-charset.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rbrich
Update of /cvs/extras/rpms/dstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6889
Modified Files:
dstat.spec
Added Files:
dstat-0.6.7-dbus.patch
Log Message:
fix nonworking dbus module
dstat-0.6.7-dbus.patch:
--- NEW FILE dstat-0.6.7-dbus.patch ---
diff -up dstat-0.6.7/plugins/dstat_dbus.py.dbus dstat-0.6.7/plugins/dstat_dbus.py
--- dstat-0.6.7/plugins/dstat_dbus.py.dbus 2007-05-12 06:09:45.000000000 +0200
+++ dstat-0.6.7/plugins/dstat_dbus.py 2008-04-25 12:57:55.000000000 +0200
@@ -16,22 +16,22 @@ class dstat_dbus(dstat):
try:
global dbus
import dbus
- try:
- self.sysbus = dbus.Bus(dbus.Bus.TYPE_SYSTEM).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
- try:
- self.sesbus = dbus.Bus(dbus.Bus.TYPE_SESSION).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
- except:
- self.sesbus = None
- except:
- raise Exception, 'Unable to connect to dbus message bus'
- return True
except:
raise Exception, 'Needs python-dbus module'
+ try:
+ self.sysbus = dbus.Interface(dbus.SystemBus().get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+ try:
+ self.sesbus = dbus.Interface(dbus.SessionBus().get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus'), 'org.freedesktop.DBus')
+ except:
+ self.sesbus = None
+ except:
+ raise Exception, 'Unable to connect to dbus message bus'
+ return True
def extract(self):
- self.val['system'] = len(self.sysbus.ListServices()) - 1
+ self.val['system'] = len(self.sysbus.ListNames()) - 1
try:
- self.val['session'] = len(self.sesbus.ListServices()) - 1
+ self.val['session'] = len(self.sesbus.ListNames()) - 1
except:
self.val['session'] = -1
# print dir(b); print dir(s); print dir(d); print d.ListServices()
Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dstat.spec 27 Mar 2008 15:38:27 -0000 1.8
+++ dstat.spec 25 Apr 2008 11:26:25 -0000 1.9
@@ -4,13 +4,14 @@
Summary: Versatile resource statistics tool
Name: dstat
Version: 0.6.7
-Release: 2%{?dist}
+Release: 3%{?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
+Patch1: dstat-0.6.7-dbus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
BuildArch: noarch
@@ -35,6 +36,7 @@
%prep
%setup -q
%patch0 -p1 -b .int
+%patch1 -p1 -b .dbus
%build
# Make sure the docs are in unix format
@@ -65,6 +67,9 @@
%{_datadir}/dstat/*.py*
%changelog
+* Fri Apr 25 2008 Radek Brich <rbrich at redhat.com> - 0.6.7-3
+- fix dbus module (new dbus-python interface since FC4)
+
* 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)
- Previous message (by thread): rpms/gd/F-8 gd.spec,1.46,1.47
- Next message (by thread): rpms/tree/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tree-1.2-carrot.patch, 1.1, 1.2 tree-1.2-colour.patch, 1.3, 1.4 tree-1.2-no-strip.patch, 1.3, 1.4 tree-preserve-timestamps.patch, 1.1, 1.2 tree.spec, 1.26, 1.27 tree-charset.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list