diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-02-21 22:44:58 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-02-21 22:44:58 +0000 |
| commit | 7c9b80ed90ea760e026d634c5ad1fbc6eb62cb0d (patch) | |
| tree | 4d6bbf5a0762eadb0cc42a9e3443de08724564b9 /setuptools/command/sdist.py | |
| parent | dad6e0273148a26a84289a672e9779d4b9aabcd1 (diff) | |
| download | external_python_setuptools-7c9b80ed90ea760e026d634c5ad1fbc6eb62cb0d.tar.gz external_python_setuptools-7c9b80ed90ea760e026d634c5ad1fbc6eb62cb0d.tar.bz2 external_python_setuptools-7c9b80ed90ea760e026d634c5ad1fbc6eb62cb0d.zip | |
Prevent failed attempts at removing MANIFEST.in from masking errors that
occur while reading it.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4042548
Diffstat (limited to 'setuptools/command/sdist.py')
| -rwxr-xr-x | setuptools/command/sdist.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 41798b60..9a0ea032 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -1,6 +1,6 @@ from distutils.command.sdist import sdist as _sdist from distutils.util import convert_path -import os,re +import os, re, sys entities = [ ("<","<"), (">", ">"), (""", '"'), ("'", "'"), @@ -152,13 +152,13 @@ class sdist(_sdist): if data not in dist_files: dist_files.append(data) - - - - - - - - - + def read_template(self): + try: + _sdist.read_template(self) + except: + # grody hack to close the template file (MANIFEST.in) + # this prevents easy_install's attempt at deleting the file from + # dying and thus masking the real error + sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close() + raise |