[pypy-svn] r75072 - pypy/branch/fast-forward/pypy/module/sys

[benjamin at codespeak.net]

Author: benjamin
Date: Thu Jun  3 20:12:00 2010
New Revision: 75072

Modified:
   pypy/branch/fast-forward/pypy/module/sys/state.py
Log:
allow for a modified lib not to exist

Modified: pypy/branch/fast-forward/pypy/module/sys/state.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/sys/state.py	(original)
+++ pypy/branch/fast-forward/pypy/module/sys/state.py	Thu Jun  3 20:12:00 2010
@@ -45,14 +45,21 @@
     python_std_lib = os.path.join(lib_python, dirname)
     checkdir(python_std_lib)
     python_std_lib_modified = os.path.join(lib_python, 'modified-' + dirname)
-    checkdir(python_std_lib_modified)
+    have_modified = True
+    try:
+        checkdir(python_std_lib_modified)
+    except OSError, e:
+        if e.errno != errno.ENOENT:
+            raise
+        have_modified = False
     pypydir = os.path.join(srcdir, 'pypy')
     pypy_lib = os.path.join(pypydir, 'lib')
     checkdir(pypy_lib)
 
     importlist = []
     importlist.append(pypy_lib)
-    importlist.append(python_std_lib_modified)
+    if have_modified:
+        importlist.append(python_std_lib_modified)
     importlist.append(python_std_lib)
     return importlist