Bypass Python 3 glibc argv problems by routing args through env

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

diff --git a/lib/cmd/ls-cmd.py b/lib/cmd/ls-cmd.py
index 28ecc535113d40d49c90b83db87757d9af99ceac..b6900b93d9d580b31ba4ba5960dbdef2cdfb825e 100755 (executable)
--- a/lib/cmd/ls-cmd.py
+++ b/lib/cmd/ls-cmd.py
@@ -1,14 +1,23 @@
 #!/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
 
 from __future__ import absolute_import
 import sys
 
-from bup import git, ls
+from bup import compat, git, ls
 from bup.io import byte_stream
 
 
@@ -17,5 +26,5 @@ git.check_repo_or_die()
 sys.stdout.flush()
 out = byte_stream(sys.stdout)
 # Check out lib/bup/ls.py for the opt spec
-rc = ls.via_cmdline(sys.argv[1:], out=out)
+rc = ls.via_cmdline(compat.argv[1:], out=out)
 sys.exit(rc)