From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 23 Oct 2017 16:38:42 +0000 (+0100)
Subject: fishdescriptor: Make Donor.pid a public member
X-Git-Tag: archive/debian/6.0.0~1^2~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=a974c5238f3a4134295a0e3f5ae5c10fbe8a62ff;p=chiark-utils.git

fishdescriptor: Make Donor.pid a public member

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

diff --git a/fishdescriptor/py/fishdescriptor/fish.py b/fishdescriptor/py/fishdescriptor/fish.py
index ff77fa9..15ad766 100644
--- a/fishdescriptor/py/fishdescriptor/fish.py
+++ b/fishdescriptor/py/fishdescriptor/fish.py
@@ -12,7 +12,7 @@ def _shuffle_fd3():
 
 class Donor():
     def __init__(d, pid):
-        d._pid = pid
+        d.pid = pid
         d._sp = subprocess.Popen(
             preexec_fn = _shuffle_fd3,
             stdin = subprocess.PIPE,
@@ -97,9 +97,9 @@ class Donor():
         sockdir = d._sock_dir(euid)
         d.mkdir(sockdir)
 
-        sockname = '%s/%s,%d' % (sockdir, os.uname().nodename, d._pid)
+        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 = ''