From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 24 Oct 2017 16:23:32 +0000 (+0100)
Subject: fishdescriptor: bugfixes
X-Git-Tag: archive/debian/6.0.0~1^2~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=8e6155d320853755d140f0cbd70399cf543cd31d;ds=sidebyside

fishdescriptor: bugfixes

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

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):