at 18.03-beta 1.1 kB view raw
1--- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 2+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 3@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): 4 5 def mount_points_from_df(): 6 import subprocess 7- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout 8+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout 9 return list(_mount_points_from_df_output(df_output)) 10 11 def _mount_points_from_df_output(df_output): 12@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : 13 ("mnt_freq", c_int), # Dump frequency (in days). 14 ("mnt_passno", c_int)] # Pass number for `fsck'. 15 16- if sys.platform == "cygwin": 17- libc_name = "cygwin1.dll" 18- else: 19- libc_name = find_library("c") 20- 21- if libc_name == None : 22- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 23+ libc_name = "@libc@" 24 25 libc = cdll.LoadLibrary(libc_name) 26 libc.getmntent.restype = POINTER(mntent_struct)