[pypy-commit] pypy default: Merged in larstiq/pypy/package.py-helpful-error-message (pull request #298)

[arigo]

Author: Armin Rigo <armin.rigo at gmail.com>
Branch: 
Changeset: r75458:e26a063cf5cc
Date: 2015-01-20 21:17 +0100
http://bitbucket.org/pypy/pypy/changeset/e26a063cf5cc/

Log:	Merged in larstiq/pypy/package.py-helpful-error-message (pull
	request #298)

	Simplify logic for the case pypy-c can not be found. Explicitly
	mention which file we checked existence of.

diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -140,16 +140,11 @@
     else:
         pypy_c = py.path.local(override_pypy_c)
     if not pypy_c.check():
-        print pypy_c
-        if os.path.isdir(os.path.dirname(str(pypy_c))):
-            raise PyPyCNotFound(
-                'Please compile pypy first, using translate.py,'
-                ' or check that you gave the correct path'
-                ' (see docstring for more info)')
-        else:
-            raise PyPyCNotFound(
-                'Bogus path: %r does not exist (see docstring for more info)'
-                % (os.path.dirname(str(pypy_c)),))
+        raise PyPyCNotFound(
+            'Expected but did not find %s.'
+            ' Please compile pypy first, using translate.py,'
+            ' or check that you gave the correct path'
+            ' with --override_pypy_c' % pypy_c)
     if not options.no_cffi:
         try:
             create_cffi_import_libraries(pypy_c, options)