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 ff77fa90c14930b992331a890e93dc2d5c2833f1..15ad7660faa3e19861a8d08cb2dde2106348cdf2 100644 (file)
--- 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):
 
 class Donor():
     def __init__(d, pid):

-        d._pid = pid
+        d.pid = pid

         d._sp = subprocess.Popen(
             preexec_fn = _shuffle_fd3,
             stdin = subprocess.PIPE,
         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)
 
         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 = ''
 
         if not d._exists(target_root):
             target_root = ''