From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 20 Dec 2019 17:49:45 +0000 (+0000)
Subject: fishdescriptor: Use Python "errno" module
X-Git-Tag: archive/debian/6.1.1~3^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=641eb44259335e86782811d8a8b0e2bc891c7ac4

fishdescriptor: Use Python "errno" module

Use Python "errno" module, not "os.errno" (which is not in modern
python3 apparently).

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

diff --git a/debian/changelog b/debian/changelog
index 6837121..fe3c111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 chiark-utils (6.0.5~citrix1) unstable; urgency=medium
 
-  * 
+  * fishdescriptor: Use Python "errno" module, not "os.errno"
+    (which is not in modern python3 apparently).
 
  --
 
diff --git a/fishdescriptor/py/fishdescriptor/fish.py b/fishdescriptor/py/fishdescriptor/fish.py
index dcb7c32..7588010 100644
--- a/fishdescriptor/py/fishdescriptor/fish.py
+++ b/fishdescriptor/py/fishdescriptor/fish.py
@@ -29,6 +29,7 @@ import struct
 import tempfile
 import shutil
 import sys
+import errno
 
 def _shuffle_fd3():
     os.dup2(1,3)
@@ -111,7 +112,7 @@ class Donor():
             os.stat(path)
             return True
         except OSError as oe:
-            if oe.errno != os.errno.ENOENT: raise oe
+            if oe.errno != errno.ENOENT: raise oe
             return False
 
     def _sock_dir(d, target_euid, target_root):
diff --git a/fishdescriptor/py/fishdescriptor/indonor.py b/fishdescriptor/py/fishdescriptor/indonor.py
index e227fb2..d911bf8 100644
--- a/fishdescriptor/py/fishdescriptor/indonor.py
+++ b/fishdescriptor/py/fishdescriptor/indonor.py
@@ -27,6 +27,7 @@ import copy
 import os
 import sys
 import socket
+import errno
 
 def _string_bytearray(s):
     # gets us bytes in py2 and py3
@@ -212,7 +213,7 @@ class DonorImplementation():
         )
         if r < 0:
             errnoval = di._parse_eval_errno('%s')
-            if errnoval != os.errno.EEXIST:
+            if errnoval != errno.EEXIST:
                 raise RuntimeError("mkdir %s failed: `%s'" %
                                    (repr(path), os.strerror(errnoval)))
             return 0