Stash the env PYTHONPATH during startup and restore it in main

[bup.git] / lib / bup / main.py

diff --git a/lib/bup/main.py b/lib/bup/main.py
index e527977a2aa9214f391167b68ffeae163f9f7d05..383611da47717e05f3f30509752a5903c69af8a5 100755 (executable)
--- a/lib/bup/main.py
+++ b/lib/bup/main.py
@@ -1,10 +1,20 @@
 
 from __future__ import absolute_import, print_function
+
+import bup_main, os, sys
+if bup_main.env_pythonpath:
+    if sys.version_info[0] < 3:
+        os.environ['PYTHONPATH'] = bup_main.env_pythonpath
+    else:
+        os.environb[b'PYTHONPATH'] = bup_main.env_pythonpath
+else:
+    del os.environ['PYTHONPATH']
+
 from importlib import import_module
 from pkgutil import iter_modules
 from subprocess import PIPE
 from threading import Thread
-import errno, getopt, os, re, select, signal, subprocess, sys
+import errno, getopt, re, select, signal, subprocess
 
 from bup import compat, path, helpers
 from bup.compat import (