SF patch 773476: NameError when there are no prefixes.

diff --git a/Lib/site.py b/Lib/site.py
index cc6dd39455c287e0b2e2567670eb27b22fab290c..3e93a07e5244c7791971917e1f54b3378367d04b 100644 (file)
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -91,11 +91,16 @@ del dir, dircase, L
 # using the -S option for Python.  See http://www.python.org/sf/586680
 if (os.name == "posix" and sys.path and
     os.path.basename(sys.path[-1]) == "Modules"):
-    from distutils.util import get_platform
-    s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
+    s = "build/lib.%s-%.3s" % ("linux-i686", sys.version)
     s = os.path.join(os.path.dirname(sys.path[-1]), s)
     sys.path.append(s)
-    del get_platform, s
+##if (os.name == "posix" and sys.path and
+##    os.path.basename(sys.path[-1]) == "Modules"):
+##    from distutils.util import get_platform
+##    s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
+##    s = os.path.join(os.path.dirname(sys.path[-1]), s)
+##    sys.path.append(s)
+##    del get_platform, s
 
 def _init_pathinfo():
     global _dirs_in_sys_path
@@ -158,6 +163,7 @@ def addpackage(sitedir, name):
         _dirs_in_sys_path = None
 
 prefixes = [sys.prefix]
+sitedir = None # make sure sitedir is initialized because of later 'del'
 if sys.exec_prefix != sys.prefix:
     prefixes.append(sys.exec_prefix)
 for prefix in prefixes: