Attachment #110148 for bug #151271

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




#

PORTNAME=	pydf
PORTVERSION=	9
CATEGORIES=	sysutils
LICENSE=	unknown
LICENSE_NAME=	Public Domain
LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
LICENSE_FILE=	${WRKSRC}/COPYING
MASTER_SITES=	http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAINTAINER=	baptiste@bapt.name
COMMENT=	A python implementation of df

SUB_FILES=	pkg-message

Lines 1-3 Link Here

(-)/usr/ports/sysutils/pydf/distinfo (-3 / +3 lines)
1	MD5 (pydf_8.tar.gz) = f1434d6d8c5291eda206c2d506e7792d	1	MD5 (pydf_9.tar.gz) = 71778fd7b6668ac157ea06a8867f2d20
2	SHA256 (pydf_8.tar.gz) = 47202ae24d00464684ab75babb8ec85d7bd79d09c5bb48441d240ed5688a8ad5	2	SHA256 (pydf_9.tar.gz) = 57f0c10449b1e3c37618f145f96b150768e15fb22af9c72f628f66a3632012c0
3	SIZE (pydf_8.tar.gz) = 12532	3	SIZE (pydf_9.tar.gz) = 12942




--- pydf.old	2010-10-05 23:50:06.000000000 +0200
+++ pydf	2010-10-06 00:28:36.000000000 +0200
@@ -1,6 +1,6 @@
-#! /usr/bin/python
+#! %%PYTHON_CMD%%
 
-import sys, os, string, subprocess, struct
+import sys, os, string, struct
 from optparse import OptionParser
 
 from math import log
@@ -10,6 +10,14 @@
     # will not give the same result for broken symbolic links, but who cares...
     os.path.lexists = os.path.exists
 
+if sys.version_info < (3, 0):
+    # getoutput() and getstatusoutput() methods have
+    # been moved from commands to the subprocess module
+    # with Python >= 3.x
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 str_ljust = str.ljust
 str_rjust = str.rjust
 str_center = str.center
@@ -61,7 +69,7 @@
     
 
 def get_terminal_width_resize():
-    c = subprocess.getoutput('resize').split('\n')
+    c = cmd.getoutput('resize').split('\n')
     c = [x for x in c if x.startswith('COLUMNS=')]
     if c:
         c = c[0]
@@ -167,7 +175,7 @@
 #end of default definitions
 
 # read configuration file
-for conffile in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
+for conffile in ["%%PREFIX%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
     if os.path.isfile(conffile):
         exec(compile(open(conffile).read(), conffile, 'exec'))
 
@@ -290,7 +298,7 @@
                 break
         else:
             # fallback, first try to parse mount output
-            status, mout = subprocess.getstatusoutput('mount')
+            status, mout = cmd.getstatusoutput('mount')
             if status !=0:
                 return dummy_result
             mlines = mout.split('\n')
@@ -300,11 +308,16 @@
                     continue
                 device, on = line.split(' on ', 1)
                 device = device.split()[0]

+                onparts = on.rstrip(")").split(" (")
                 on = onparts[0]
-                # option format: (a,b,..)
-                opts = onparts[-1][1:-1].split(',')
-                r[on] = (device, '', opts)
+                l = onparts[1].split(", ")
+                if len(l) == 2:
+                    typ, opts = l
+                else:
+                    typ = l[0]
+                    opts = ''
+                opts = opts.split(", ")
+                r[on] = (device, typ, opts)
 
             if r:
                 return r
@@ -334,7 +347,11 @@
 def get_row_mp(mp):
     if mp:
         if mp in mountpoints:
-            device, fstype, opts = mountpoints[mp]
+            if len(mountpoints[mp]) == 2:
+                device, fstype = mountpoints[mp]
+                opts = ''
+            else:
+                device, fstype, opts = mountpoints[mp]
         else:
             # oops, the mountpoint is not in /etc/mtab or equivalent
             # return dummy values
@@ -346,9 +363,9 @@
             status = os.statvfs(mp)
         except (OSError, IOError):
             status = DumbStatus()
-        fs_blocksize = status.f_bsize
+        fs_blocksize = status.f_frsize
+        fs_blocksize = status[F_FRSIZE]
         if fs_blocksize == 0:
-            fs_blocksize = status.f_frsize
+            fs_blocksize = status.f_bsize
         free = status.f_bfree
         size = status.f_blocks
         avail = status.f_bavail
@@ -377,7 +394,7 @@
             used_f = myformat(used, sizeformat, fs_blocksize)
             avail_f = myformat(avail, sizeformat, fs_blocksize)
             try:

                 perc_f = str(perc)
             except ZeroDivisionError:
                 perc = 0
@@ -446,7 +463,7 @@
     "test if fs (as type) is a special one"
     "in addition, a filesystem is special if it has number of blocks equal to 0"
     fs = fs.lower()
-    return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs" ]
+    return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs", "linprocfs", "fdescfs" ]
 
 def get_table(mps):
     "table is a list of rows"

Return to bug 151271

Lines 6-17 Link Here

(-)/usr/ports/sysutils/pydf/Makefile (-2 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= pydf	8	PORTNAME= pydf
9	PORTVERSION= 8	9	PORTVERSION= 9
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
		11	LICENSE= unknown
		12	LICENSE_NAME= Public Domain
		13	LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
		14	LICENSE_FILE= ${WRKSRC}/COPYING
11	MASTER_SITES= http://kassiopeia.juls.savba.sk/~garabik/software/pydf/	15	MASTER_SITES= http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	16	DISTNAME= ${PORTNAME}_${PORTVERSION}
13		17
14	MAINTAINER= gwarf@gwarf.org	18	MAINTAINER= baptiste@bapt.name
15	COMMENT= A python implementation of df	19	COMMENT= A python implementation of df
16		20
17	SUB_FILES= pkg-message	21	SUB_FILES= pkg-message

Lines 1-21 Link Here

(-)/usr/ports/sysutils/pydf/files/patch-pydf (-25 / +78 lines)
1	--- pydf.orig 2009-11-10 00:38:15.000000000 +0100	1	--- pydf.old 2010-10-05 23:50:06.000000000 +0200
2	+++ pydf 2009-11-10 02:13:13.000000000 +0100	2	+++ pydf 2010-10-06 00:28:36.000000000 +0200
3	@@ -1,4 +1,4 @@	3	@@ -1,6 +1,6 @@
4	-#! /usr/bin/python	4	-#! /usr/bin/python
5	+#! %%PYTHON_CMD%%	5	+#! %%PYTHON_CMD%%
6		6
7	import sys, os, string, types, commands, struct	7	-import sys, os, string, subprocess, struct
		8	+import sys, os, string, struct
8	from optparse import OptionParser	9	from optparse import OptionParser
9	@@ -169,7 +169,7 @@	10
		11	from math import log
		12	@@ -10,6 +10,14 @@
		13	# will not give the same result for broken symbolic links, but who cares...
		14	os.path.lexists = os.path.exists
		15
		16	+if sys.version_info < (3, 0):
		17	+ # getoutput() and getstatusoutput() methods have
		18	+ # been moved from commands to the subprocess module
		19	+ # with Python >= 3.x
		20	+ import commands as cmd
		21	+else:
		22	+ import subprocess as cmd
		23	+
		24	str_ljust = str.ljust
		25	str_rjust = str.rjust
		26	str_center = str.center
		27	@@ -61,7 +69,7 @@
		28
		29
		30	def get_terminal_width_resize():
		31	- c = subprocess.getoutput('resize').split('\n')
		32	+ c = cmd.getoutput('resize').split('\n')
		33	c = [x for x in c if x.startswith('COLUMNS=')]
		34	if c:
		35	c = c[0]
		36	@@ -167,7 +175,7 @@
10	#end of default definitions	37	#end of default definitions
11		38
12	# read configuration file	39	# read configuration file
13	-for conffile in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:	40	-for conffile in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
14	+for conffile in ["%%PREFIX%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:	41	+for conffile in ["%%PREFIX%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
15	if os.path.isfile(conffile):	42	if os.path.isfile(conffile):
16	execfile(conffile)	43	exec(compile(open(conffile).read(), conffile, 'exec'))
17		44
18	@@ -294,11 +294,12 @@	45	@@ -290,7 +298,7 @@
		46	break
		47	else:
		48	# fallback, first try to parse mount output
		49	- status, mout = subprocess.getstatusoutput('mount')
		50	+ status, mout = cmd.getstatusoutput('mount')
		51	if status !=0:
		52	return dummy_result
		53	mlines = mout.split('\n')
		54	@@ -300,11 +308,16 @@
19	continue	55	continue
20	device, on = line.split(' on ', 1)	56	device, on = line.split(' on ', 1)
21	device = device.split()[0]	57	device = device.split()[0]
Lines 23-50 Link Here
23	+ onparts = on.rstrip(")").split(" (")	59	+ onparts = on.rstrip(")").split(" (")
24	on = onparts[0]	60	on = onparts[0]
25	- # option format: (a,b,..)	61	- # option format: (a,b,..)
26	- opts = onparts[-1][1:-1].split(",")	62	- opts = onparts[-1][1:-1].split(',')
27	- r[on] = (device, '', opts)	63	- r[on] = (device, '', opts)
28	+ # option format: (fstype, a, b, ..)	64	+ l = onparts[1].split(", ")
29	+ typ, opts = onparts[1].split(", ", 1)	65	+ if len(l) == 2:
		66	+ typ, opts = l
		67	+ else:
		68	+ typ = l[0]
		69	+ opts = ''
30	+ opts = opts.split(", ")	70	+ opts = opts.split(", ")
31	+ r[on] = (device, typ, opts)	71	+ r[on] = (device, typ, opts)
32		72
33	if r:	73	if r:
34	return r	74	return r
35	@@ -335,9 +336,9 @@	75	@@ -334,7 +347,11 @@
		76	def get_row_mp(mp):
		77	if mp:
		78	if mp in mountpoints:
		79	- device, fstype, opts = mountpoints[mp]
		80	+ if len(mountpoints[mp]) == 2:
		81	+ device, fstype = mountpoints[mp]
		82	+ opts = ''
		83	+ else:
		84	+ device, fstype, opts = mountpoints[mp]
		85	else:
		86	# oops, the mountpoint is not in /etc/mtab or equivalent
		87	# return dummy values
		88	@@ -346,9 +363,9 @@
		89	status = os.statvfs(mp)
36	except (OSError, IOError):	90	except (OSError, IOError):
37	status = 10*[0]	91	status = DumbStatus()
38		92	- fs_blocksize = status.f_bsize
39	- fs_blocksize = status[F_BSIZE]	93	+ fs_blocksize = status.f_frsize
40	+ fs_blocksize = status[F_FRSIZE]
41	if fs_blocksize == 0:	94	if fs_blocksize == 0:
42	- fs_blocksize = status[F_FRSIZE]	95	- fs_blocksize = status.f_frsize
43	+ fs_blocksize = status[F_BSIZE]	96	+ fs_blocksize = status.f_bsize
44	free = status[F_BFREE]	97	free = status.f_bfree
45	size = status[F_BLOCKS]	98	size = status.f_blocks
46	avail = status[F_BAVAIL]	99	avail = status.f_bavail
47	@@ -366,7 +367,7 @@	100	@@ -377,7 +394,7 @@
48	used_f = myformat(used, sizeformat, fs_blocksize)	101	used_f = myformat(used, sizeformat, fs_blocksize)
49	avail_f = myformat(avail, sizeformat, fs_blocksize)	102	avail_f = myformat(avail, sizeformat, fs_blocksize)
50	try:	103	try:
Lines 53-64 Link Here
53	perc_f = str(perc)	106	perc_f = str(perc)
54	except ZeroDivisionError:	107	except ZeroDivisionError:
55	perc = 0	108	perc = 0
56	@@ -435,7 +436,7 @@	109	@@ -446,7 +463,7 @@
57	"test if fs (as type) is a special one"	110	"test if fs (as type) is a special one"
58	"in addition, a filesystem is special if it has number of blocks equal to 0"	111	"in addition, a filesystem is special if it has number of blocks equal to 0"
59	fs = fs.lower()	112	fs = fs.lower()
60	- return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs" ]	113	- return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs" ]
61	+ return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs", "linprocfs" ]	114	+ return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs", "linprocfs", "fdescfs" ]
62		115
63	def get_table(mps):	116	def get_table(mps):
64	"table is a list of rows"	117	"table is a list of rows"