[pypy-svn] r16194 - pypy/dist/lib-python

hpk at codespeak.net hpk at codespeak.net
Mon Aug 22 13:55:45 CEST 2005


Author: hpk
Date: Mon Aug 22 13:55:43 2005
New Revision: 16194

Modified:
   pypy/dist/lib-python/conftest.py
Log:
be more accepting towards problems in
getting the svn-revisions determined
(mostly fails to either a missing svn binary
or a wrong locale)


Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Mon Aug 22 13:55:43 2005
@@ -786,8 +786,14 @@
 def getrev(path): 
     try: 
         return py.path.svnwc(pypydir).info().rev
-    except py.process.cmdexec.Error: 
-        return 'unknown'  # on windows people not always have 'svn' in their path
+    except (KeyboardInterrupt, SystemExit):
+        raise
+    except:
+        # on windows people not always have 'svn' in their path
+        # but there are also other kinds of problems that
+        # could occur and we just default to revision
+        # "unknown" for them
+        return 'unknown'  
 
 class RunFileExternal(py.test.collect.Module): 
     def __init__(self, name, parent, regrtest): 



More information about the Pypy-commit mailing list