ap = subprocess.Popen(
stdin = subprocess.DEVNULL,
stdout = subprocess.PIPE,
- args = ['perl','-we',perl_script] + fds
+ args = ['perl','-we',perl_script] + [str(x) for x in fds]
)
(output, dummy) = ap.communicate()
return output
def _sock_dir(d, target_euid):
run_dir = '/run/user/%d' % target_euid
if d._exists(run_dir):
- return run_dir + 'fishdescriptor'
+ return run_dir + '/fishdescriptor'
try:
pw = pwd.getpwuid(target_euid)
- return pw.pw_dir + '.fishdescriptor'
+ return pw.pw_dir + '/.fishdescriptor'
except KeyError:
pass
sockname = '%s/%s,%d' % (sockdir, os.uname().nodename, d._pid)
- target_root = '/proc/%d/root/' % d._pid
+ target_root = '/proc/%d/root' % d._pid
if not d._exists(target_root):
target_root = ''