import-duplicity-cmd: adjust for python 3 and enable test

[bup.git] / cmd / on-cmd.py

diff --git a/cmd/on-cmd.py b/cmd/on-cmd.py
index 60759b64a6d6d85332c489de8a81df04f6d57f94..2c0e9fc808538ba4abb264be964bb3b36e0138c9 100755 (executable)
--- a/cmd/on-cmd.py
+++ b/cmd/on-cmd.py
@@ -1,12 +1,25 @@
-#!/usr/bin/env python
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import
+from subprocess import PIPE
 import sys, os, struct, getopt, subprocess, signal
+
 from bup import options, ssh, path
-from bup.helpers import *
+from bup.compat import argv_bytes
+from bup.helpers import DemuxConn, log
+from bup.io import byte_stream
+
 
 optspec = """
 bup on <hostname> index ...
 bup on <hostname> save ...
 bup on <hostname> split ...
+bup on <hostname> get ...
 """
 o = options.Options(optspec, optfunc=getopt.getopt)
 (opt, flags, extra) = o.parse(sys.argv[1:])
@@ -23,28 +36,34 @@ def handler(signum, frame):
 signal.signal(signal.SIGTERM, handler)
 signal.signal(signal.SIGINT, handler)
 
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
+
 try:
     sp = None
     p = None
     ret = 99
 
-    hp = extra[0].split(':')
+    hp = argv_bytes(extra[0]).split(b':')
     if len(hp) == 1:
         (hostname, port) = (hp[0], None)
     else:
         (hostname, port) = hp
-
-    argv = extra[1:]
-    p = ssh.connect(hostname, port, 'on--server')
+    argv = [argv_bytes(x) for x in extra[1:]]
+    p = ssh.connect(hostname, port, b'on--server', stderr=PIPE)
 
     try:
-        argvs = '\0'.join(['bup'] + argv)
+        argvs = b'\0'.join([b'bup'] + argv)
         p.stdin.write(struct.pack('!I', len(argvs)) + argvs)
         p.stdin.flush()
-        sp = subprocess.Popen([path.exe(), 'server'],
+        sp = subprocess.Popen([path.exe(), b'server'],
                               stdin=p.stdout, stdout=p.stdin)
         p.stdin.close()
         p.stdout.close()
+        # Demultiplex remote client's stderr (back to stdout/stderr).
+        dmc = DemuxConn(p.stderr.fileno(), open(os.devnull, "wb"))
+        for line in iter(dmc.readline, b''):
+            out.write(line)
     finally:
         while 1:
             # if we get a signal while waiting, we have to keep waiting, just
@@ -54,11 +73,11 @@ try:
                 if sp:
                     sp.wait()
                 break
-            except SigException, e:
+            except SigException as e:
                 log('\nbup on: %s\n' % e)
                 os.kill(p.pid, e.signum)
                 ret = 84
-except SigException, e:
+except SigException as e:
     if ret == 0:
         ret = 99
     log('\nbup on: %s\n' % e)