Attachment #42390 for bug #66115

View | Details | Raw Unified | Return to bug 66115
Collapse All | Expand All

Lines 6-13 Link Here

(-)gdesklets/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gdesklets	8	PORTNAME= gdesklets
9	PORTVERSION= 0.26.1	9	PORTVERSION= 0.26.2
10	PORTREVISION= 1
11	CATEGORIES= deskutils gnome	10	CATEGORIES= deskutils gnome
12	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/	11	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/
13	DISTNAME= gDesklets-${PORTVERSION}	12	DISTNAME= gDesklets-${PORTVERSION}

Lines 1-2 Link Here

(-)gdesklets/distinfo (-2 / +2 lines)
1	MD5 (gDesklets-0.26.1.tar.bz2) = bae8006b869c6fb05064579f7593d449	1	MD5 (gDesklets-0.26.2.tar.bz2) = c001e527a4ed4fe2b66d71df9b8b21ab
2	SIZE (gDesklets-0.26.1.tar.bz2) = 339474	2	SIZE (gDesklets-0.26.2.tar.bz2) = 401097




--- libdesklets/Disk.py.orig	Fri Feb 20 14:29:07 2004
+++ libdesklets/Disk.py	Fri Apr 30 15:50:42 2004
@@ -1,6 +1,7 @@
 import glibtop
 import polling
-
+import os
+import statvfs
 
 class Disk:
 
@@ -21,14 +22,19 @@
     #
     def __poll_partitions(self):
 

 
         return partitions
             
@@ -43,15 +49,19 @@
     #:/function
     #
     def __poll_size(self, partition):
-
-        blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
-        free = float(bfree * 512)
-        total = float(blocks * 512)
-        used = total - free
-
-        return (total, used)#, free)
-
-
+                                                                                                                                
+          try:
+              statvfs_data = os.statvfs(partition)
+              free = float(statvfs_data[statvfs.F_BFREE] * statvfs_data[statvfs.F_FRSIZE])
+              total = float(statvfs_data[statvfs.F_BLOCKS] * statvfs_data[statvfs.F_FRSIZE])
+          except:
+              blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
+              free = float(bfree * 512)
+              total = float(blocks * 512)
+                                                                                                                                
+          used = total - free
+                                                                                                                                
+          return (total, used)#, free)
 
     #
     #:function get_fs | partition | Returns the filesystem for the given

Return to bug 66115

Lines 1-14 Link Here

(-)gdesklets/files/patch-libdesklets::Disk.py (-4 / +34 lines)
1	--- libdesklets/Disk.py.orig Mon Feb 23 10:52:50 2004	1	--- libdesklets/Disk.py.orig Fri Feb 20 14:29:07 2004
2	+++ libdesklets/Disk.py Mon Feb 23 10:54:31 2004	2	+++ libdesklets/Disk.py Fri Apr 30 15:50:42 2004
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,7 @@
4	import glibtop	4	import glibtop
5	import polling	5	import polling
6	-	6	-
7	+import os	7	+import os
		8	+import statvfs
8		9
9	class Disk:	10	class Disk:
10		11
11	@@ -21,14 +21,19 @@	12	@@ -21,14 +22,19 @@
12	#	13	#
13	def __poll_partitions(self):	14	def __poll_partitions(self):
14		15
Lines 35-37 Link Here
35		36
36	return partitions	37	return partitions
37		38
		39	@@ -43,15 +49,19 @@
		40	#:/function
		41	#
		42	def __poll_size(self, partition):
		43	-
		44	- blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
		45	- free = float(bfree * 512)
		46	- total = float(blocks * 512)
		47	- used = total - free
		48	-
		49	- return (total, used)#, free)
		50	-
		51	-
		52	+
		53	+ try:
		54	+ statvfs_data = os.statvfs(partition)
		55	+ free = float(statvfs_data[statvfs.F_BFREE] * statvfs_data[statvfs.F_FRSIZE])
		56	+ total = float(statvfs_data[statvfs.F_BLOCKS] * statvfs_data[statvfs.F_FRSIZE])
		57	+ except:
		58	+ blocks, bfree, bavail, files, ffree = glibtop.get_fsusage(partition)
		59	+ free = float(bfree * 512)
		60	+ total = float(blocks * 512)
		61	+
		62	+ used = total - free
		63	+
		64	+ return (total, used)#, free)
		65
		66	#
		67	#:function get_fs \| partition \| Returns the filesystem for the given