pyrox.dev
1diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py
2--- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py 2014-12-23 10:10:43.808470486 +0100
3+++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py 2014-12-23 10:11:02.688517975 +0100
4@@ -9,7 +9,7 @@ from pprint import pprint
5 @istest
6 class WhenNoArgs:
7 def setUp(self):
8- process = Popen(['python', 'trashcli/rm.py'],
9+ process = Popen(['@python@', 'trashcli/rm.py'],
10 env={'PYTHONPATH':'.'},
11 stdin=None,
12 stdout=PIPE,
13diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py
14--- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100
15+++ trash-cli-0.12.9.14/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100
16@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
17
18 def mount_points_from_df():
19 import subprocess
20- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
21+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
22 return list(_mount_points_from_df_output(df_output))
23
24 def _mount_points_from_df_output(df_output):
25@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
26 ("mnt_freq", c_int), # Dump frequency (in days).
27 ("mnt_passno", c_int)] # Pass number for `fsck'.
28
29- if sys.platform == "cygwin":
30- libc_name = "cygwin1.dll"
31- else:
32- libc_name = find_library("c")
33-
34- if libc_name == None :
35- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
36+ libc_name = "@libc@"
37
38 libc = cdll.LoadLibrary(libc_name)
39 libc.getmntent.restype = POINTER(mntent_struct)