From 8e6155d320853755d140f0cbd70399cf543cd31d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 24 Oct 2017 17:23:32 +0100 Subject: [PATCH] fishdescriptor: bugfixes Signed-off-by: Ian Jackson --- fishdescriptor/fishdescriptor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor index 703717c..dc17762 100755 --- a/fishdescriptor/fishdescriptor +++ b/fishdescriptor/fishdescriptor @@ -6,6 +6,7 @@ import optparse import re import subprocess import socket +import os donor = None @@ -82,7 +83,7 @@ def implement_sockinfo(nominal): sock.close() def permute_fds_for_exec(): - actual2intended = { info[0]: nominal for nominal, info in fdmap.items } + actual2intended = { info[0]: nominal for nominal, info in fdmap.items() } # invariant at the start of each loop iteration: # for each intended (aka `nominal') we have processed: # relevant open-file is only held in fd intended @@ -110,7 +111,7 @@ def permute_fds_for_exec(): def implement_exec(argl): if donor is not None: donor.detach() sys.stdout.flush() - permut_fds_for_exec() + permute_fds_for_exec() os.execvp(argl[0], argl) def set_donor(pid): -- 2.30.2