test: add pylint and test imports

[bup.git] / lib / bup / cmd / daemon.py

diff --git a/lib/bup/cmd/daemon.py b/lib/bup/cmd/daemon.py
index 322e6b9cdc9b67ec14f5fd82c3ee85434c31f5a7..dca17b40866bcdabc6a8499a338025f7af139dc1 100755 (executable)
--- a/lib/bup/cmd/daemon.py
+++ b/lib/bup/cmd/daemon.py
@@ -1,29 +1,10 @@
-#!/bin/sh
-"""": # -*-python-*-
-# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
-export "BUP_ARGV_0"="$0"
-arg_i=1
-for arg in "$@"; do
-    export "BUP_ARGV_${arg_i}"="$arg"
-    shift
-    arg_i=$((arg_i + 1))
-done
-# Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/../../../config/bin/python" || exit $?
-exec "$bup_python" "$0"
-"""
-# end of bup preamble
 
 from __future__ import absolute_import
+import fcntl, getopt, os, socket, subprocess, sys, select
 
-# Intentionally replace the dirname "$0" that python prepends
-import os, sys
-sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/../..'
-
-import getopt, socket, subprocess, fcntl
+from bup import options, path
+from bup.helpers import log, debug1
 
-from bup import compat, options, path
-from bup.helpers import *
 
 optspec = """
 bup daemon [options...] -- [bup-server options...]
@@ -31,61 +12,59 @@ bup daemon [options...] -- [bup-server options...]
 l,listen  ip address to listen on, defaults to *
 p,port    port to listen on, defaults to 1982
 """
-o = options.Options(optspec, optfunc=getopt.getopt)
-opt, flags, extra = o.parse(compat.argv[1:])
-
-host = opt.listen
-port = opt.port and int(opt.port) or 1982
 
-import socket
-import sys
+def main(argv):
+    o = options.Options(optspec, optfunc=getopt.getopt)
+    opt, flags, extra = o.parse_bytes(argv[1:])
 
-socks = []
-e = None
-for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
-                              socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
-    af, socktype, proto, canonname, sa = res
-    try:
-        s = socket.socket(af, socktype, proto)
-    except socket.error as e:
-        continue
-    try:
-        if af == socket.AF_INET6:
-            log("bup daemon: listening on [%s]:%s\n" % sa[:2])
-        else:
-            log("bup daemon: listening on %s:%s\n" % sa[:2])
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        s.bind(sa)
-        s.listen(1)
-        fcntl.fcntl(s.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-    except socket.error as e:
-        s.close()
-        continue
-    socks.append(s)
+    host = opt.listen
+    port = opt.port and int(opt.port) or 1982
+    socks = []
+    e = None
+    for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+                                  socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
+        af, socktype, proto, canonname, sa = res
+        try:
+            s = socket.socket(af, socktype, proto)
+        except socket.error as e:
+            continue
+        try:
+            if af == socket.AF_INET6:
+                log("bup daemon: listening on [%s]:%s\n" % sa[:2])
+            else:
+                log("bup daemon: listening on %s:%s\n" % sa[:2])
+            s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            s.bind(sa)
+            s.listen(1)
+            fcntl.fcntl(s.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
+        except socket.error as e:
+            s.close()
+            continue
+        socks.append(s)
 
-if not socks:
-    log('bup daemon: listen socket: %s\n' % e.args[1])
-    sys.exit(1)
+    if not socks:
+        log('bup daemon: listen socket: %s\n' % e.args[1])
+        sys.exit(1)
 
-try:
-    while True:
-        [rl,wl,xl] = select.select(socks, [], [], 60)
-        for l in rl:
-            s, src = l.accept()
-            try:
-                log("Socket accepted connection from %s\n" % (src,))
-                fd1 = os.dup(s.fileno())
-                fd2 = os.dup(s.fileno())
-                s.close()
-                sp = subprocess.Popen([path.exe(), 'mux', '--',
-                                       path.exe(), 'server']
-                                      + extra, stdin=fd1, stdout=fd2)
-            finally:
-                os.close(fd1)
-                os.close(fd2)
-finally:
-    for l in socks:
-        l.shutdown(socket.SHUT_RDWR)
-        l.close()
+    try:
+        while True:
+            [rl,wl,xl] = select.select(socks, [], [], 60)
+            for l in rl:
+                s, src = l.accept()
+                try:
+                    log("Socket accepted connection from %s\n" % (src,))
+                    fd1 = os.dup(s.fileno())
+                    fd2 = os.dup(s.fileno())
+                    s.close()
+                    sp = subprocess.Popen([path.exe(), 'mux', '--',
+                                           path.exe(), 'server']
+                                          + extra, stdin=fd1, stdout=fd2)
+                finally:
+                    os.close(fd1)
+                    os.close(fd2)
+    finally:
+        for l in socks:
+            l.shutdown(socket.SHUT_RDWR)
+            l.close()
 
-debug1("bup daemon: done")
+    debug1("bup daemon: done")