Attachment 97968 Details for Bug 136788 – file.diff

[patch] file.diff

file.diff (text/plain), 3.10 KB, created by jochen on 2009-07-15 14:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jochen

Created: 2009-07-15 14:10:04 UTC

Size: 3.10 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/pydf.orig/distinfo /usr/ports/sysutils/pydf/distinfo
>--- /usr/ports/sysutils/pydf.orig/distinfo      2009-01-15 08:37:28.000000000 +0000
>+++ /usr/ports/sysutils/pydf/distinfo   2009-07-15 12:47:04.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (pydf_6.tar.gz) = b71572cc111a8f68edc876351b0f7733
>-SHA256 (pydf_6.tar.gz) = 4202b4cbbd631b40f6e2fbd73bf0a6397899e6acf148e84864731a92cfa5cb80
>-SIZE (pydf_6.tar.gz) = 12140
>+MD5 (pydf_7.tar.gz) = 54c631b1bf8d00111d49567b2e83d718
>+SHA256 (pydf_7.tar.gz) = ce09e48bf6d03d4128c3dfbbe4cdd093ac533006440cc6aa239592e0af223c23
>+SIZE (pydf_7.tar.gz) = 12487
>diff -ruN --exclude=CVS /usr/ports/sysutils/pydf.orig/files/patch-pydf /usr/ports/sysutils/pydf/files/patch-pydf
>--- /usr/ports/sysutils/pydf.orig/files/patch-pydf      2007-12-14 16:54:24.000000000 +0000
>+++ /usr/ports/sysutils/pydf/files/patch-pydf   2009-07-15 12:55:59.000000000 +0000
>@@ -1,47 +1,49 @@
>---- pydf.original      Tue Dec  4 23:02:26 2007
>-+++ pydf       Tue Dec  4 23:02:14 2007
>+--- pydf.orig  2009-04-10 13:00:07.000000000 +0000
>++++ pydf       2009-07-15 12:54:08.000000000 +0000
> @@ -1,4 +1,4 @@
> -#! /usr/bin/python
> +#! %%PYTHON_CMD%%
>-
>+
>  import sys, os, string, types, commands, struct
>  from optparse import OptionParser
>-@@ -166,7 +166,7 @@
>+@@ -169,8 +169,8 @@
>  #end of default definitions
>-
>+
>  # read configuration file
> -for i in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
>-+for i in ["%%PREFIX%%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
>-     if os.path.isfile(i):
>+-    if os.path.isfile(i):
>++for i in ["%%PREFIX%%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
>++      if os.path.isfile(i):
>          execfile(i)
>-
>-@@ -336,9 +336,9 @@
>+
>+
>+@@ -344,9 +344,9 @@
>          except OSError, IOError:
>              status = 10*[0]
>-
>+
> -        fs_blocksize = status[F_BSIZE]
> +        fs_blocksize = status[F_FRSIZE]
>          if fs_blocksize == 0:
> -            fs_blocksize = status[F_FRSIZE]
> +            fs_blocksize = status[F_BSIZE]
>          free = status[F_BFREE]
>-         used = long(status[F_BLOCKS]-free)
>          size = status[F_BLOCKS]
>-@@ -351,7 +351,7 @@
>-         avail_f = myformat(avail, sizeformat, fs_blocksize)
>-
>-         try:
>--            perc = round(100.*used/size, 1)
>-+            perc = round(100.*used/(avail+used), 1)
>-         except ZeroDivisionError:
>-             perc = 0
>-         perc_f = str(perc)
>-@@ -419,7 +419,7 @@
>+         avail = status[F_BAVAIL]
>+@@ -375,7 +375,7 @@
>+             used_f = myformat(used, sizeformat, fs_blocksize)
>+             avail_f = myformat(avail, sizeformat, fs_blocksize)
>+             try:
>+-                perc = round(100.*used/size, 1)
>++                perc = round(100.*used/(avail+used), 1)
>+                 perc_f = str(perc)
>+             except ZeroDivisionError:
>+                 perc = 0
>+@@ -444,7 +444,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" ]

Actions: View | Diff

Attachments on bug 136788: 97967 | 97968