Add bup map including test results to pytest items

[bup.git] / lib / cmd / server-cmd.py

diff --git a/lib/cmd/server-cmd.py b/lib/cmd/server-cmd.py
index 2c8cc051a9febdf583e967e5ee378e5176a9baea..ada92d24dc34dc4dcfc1aa1a45998fcf7c38a251 100755 (executable)
--- a/lib/cmd/server-cmd.py
+++ b/lib/cmd/server-cmd.py
@@ -1,15 +1,26 @@
 #!/bin/sh
 """": # -*-python-*-
-bup_python="$(dirname "$0")/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+# 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
 from binascii import hexlify, unhexlify
-import os, sys, struct, subprocess
+import os, struct, subprocess, sys
 
-from bup import options, git, vfs, vint
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, git, vfs, vint
 from bup.compat import environ, hexstr
 from bup.git import MissingObject
 from bup.helpers import (Conn, debug1, debug2, linereader, lines_until_sentinel,
@@ -265,7 +276,7 @@ optspec = """
 bup server
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+(opt, flags, extra) = o.parse(compat.argv[1:])
 
 if extra:
     o.fatal('no arguments expected')