disambiguate types returned by get_fd_or_server

2016-02-01 13:10:01 +01:00
parent 690c862923
commit ddc1869551
2 changed files with 6 additions and 8 deletions
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -48,12 +48,12 @@ def get_fd_or_server(config):
    lockfile = get_lockfile(config)
    while True:
        try:
-            return os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_WRONLY)
+            return os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_WRONLY), None
        except OSError:
            pass
        server = get_server(config)
        if server is not None:
-            return server
+            return None, server
        # Couldn't connect; remove lockfile and try again.
        remove_lockfile(lockfile)