# end of bup preamble
from __future__ import absolute_import, print_function
-import errno, re, sys, os, subprocess, signal, getopt
+import errno, getopt, os, re, select, signal, subprocess, sys
+from subprocess import PIPE
+
+from bup.compat import environ, restore_lc_env
if sys.version_info[0] != 2 \
- and not os.environ.get('BUP_ALLOW_UNEXPECTED_PYTHON_VERSION') == 'true':
+ and not environ.get(b'BUP_ALLOW_UNEXPECTED_PYTHON_VERSION') == b'true':
print('error: bup may crash with python versions other than 2, or eat your data',
file=sys.stderr)
sys.exit(2)
-from subprocess import PIPE
-import select
+restore_lc_env()
from bup import compat, path, helpers
from bup.compat import add_ex_tb, add_ex_ctx, wrap_main
script_home="$(cd "$(dirname "$cmdpath")" && pwd -P)"
cd "$top"
+bup_libdir="$script_home/../lib" # bup_libdir will be adjusted during install
+export PYTHONPATH="$bup_libdir${PYTHONPATH:+:$PYTHONPATH}"
+
# Force python to use ISO-8859-1 (aka Latin 1), a single-byte
# encoding, to help avoid any manipulation of data from system APIs
# (paths, users, groups, command line arguments, etc.)
-# Preserve for selective use
-if [ "${LC_CTYPE+x}" ]; then export BUP_LC_CTYPE="$LC_CTYPE"; fi
-if [ "${LC_ALL+x}" ]; then
- export BUP_LC_ALL="$LC_ALL"
- export LC_COLLATE="$LC_ALL"
- export LC_MONETARY="$LC_ALL"
- export LC_NUMERIC="$LC_ALL"
- export LC_TIME="$LC_ALL"
- export LC_MESSAGES="$LC_ALL"
- unset LC_ALL
-fi
-
export PYTHONCOERCECLOCALE=0 # Perhaps not necessary, but shouldn't hurt
-export LC_CTYPE=ISO-8859-1
-bup_libdir="$script_home/../lib" # bup_libdir will be adjusted during install
-
-export PYTHONPATH="$bup_libdir${PYTHONPATH:+:$PYTHONPATH}"
+# We can't just export LC_CTYPE directly here because the locale might
+# not exist outside python, and then bash (at least) may be cranky.
-exec @bup_python@ "$@"
+if [ "${LC_ALL+x}" ]; then
+ unset LC_ALL
+ exec env \
+ BUP_LC_ALL="$LC_ALL" \
+ LC_COLLATE="$LC_ALL" \
+ LC_MONETARY="$LC_ALL" \
+ LC_NUMERIC="$LC_ALL" \
+ LC_TIME="$LC_ALL" \
+ LC_MESSAGES="$LC_ALL" \
+ LC_CTYPE=ISO-8859-1 \
+ @bup_python@ "$@"
+elif [ "${LC_CTYPE+x}" ]; then
+ exec env \
+ BUP_LC_CTYPE="$LC_CTYPE" \
+ LC_CTYPE=ISO-8859-1 \
+ @bup_python@ "$@"
+else
+ exec env \
+ LC_CTYPE=ISO-8859-1 \
+ @bup_python@ "$@"
+fi
assert type(y) in (bytes, buffer)
return buffer(x) + y
+
+def restore_lc_env():
+ # Once we're up and running with iso-8859-1, undo the bup-python
+ # LC_CTYPE hackery, so we don't affect unrelated subprocesses.
+ bup_lc_all = environ.get(b'BUP_LC_ALL')
+ if bup_lc_all:
+ del environ[b'LC_COLLATE']
+ del environ[b'LC_CTYPE']
+ del environ[b'LC_MONETARY']
+ del environ[b'LC_NUMERIC']
+ del environ[b'LC_TIME']
+ del environ[b'LC_MESSAGES']
+ del environ[b'LC_MESSAGES']
+ environ[b'LC_ALL'] = bup_lc_all
+ return
+ bup_lc_ctype = environ.get(b'BUP_LC_CTYPE')
+ if bup_lc_ctype:
+ environ[b'LC_CTYPE'] = bup_lc_ctype
+
def wrap_main(main):
"""Run main() and raise a SystemExit with the return value if it
returns, pass along any SystemExit it raises, convert