Author: Wouter van Heyst <wouter.p...@richtlijn.be>
Branch: package.py-helpful-error-message
Changeset: r75457:67e9fc4a82d6
Date: 2015-01-20 21:33 +0200
http://bitbucket.org/pypy/pypy/changeset/67e9fc4a82d6/
Log: 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)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
