Bypass Python 3 glibc argv problems by routing args through env

[bup.git] / lib / cmd / list-idx-cmd.py

diff --git a/lib/cmd/list-idx-cmd.py b/lib/cmd/list-idx-cmd.py
index 78bb0a00fb94dc9d26e4756d35833d239d5a7e26..d9d318f4480361ac03fd27418c71346061f5ed38 100755 (executable)
--- a/lib/cmd/list-idx-cmd.py
+++ b/lib/cmd/list-idx-cmd.py
@@ -1,7 +1,16 @@
 #!/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")/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+exec "$bup_python" "$0"
 """
 # end of bup preamble
 
@@ -9,7 +18,7 @@ from __future__ import absolute_import, print_function
 from binascii import hexlify, unhexlify
 import sys, os
 
-from bup import git, options
+from bup import compat, git, options
 from bup.compat import argv_bytes
 from bup.helpers import add_error, handle_ctrl_c, log, qprogress, saved_errors
 from bup.io import byte_stream
@@ -20,7 +29,7 @@ bup list-idx [--find=<prefix>] <idxfilenames...>
 find=   display only objects that start with <prefix>
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 handle_ctrl_c()