diff options
author | PJ Eby <distutils-sig@python.org> | 2005-07-10 04:49:31 +0000 |
---|---|---|
committer | PJ Eby <distutils-sig@python.org> | 2005-07-10 04:49:31 +0000 |
commit | 451377d0e877fc610d1bdf8181ba70a90e4c14cc (patch) | |
tree | 89e0ecc02b8040a747eee92971c0166e63e9e6b2 /setuptools/archive_util.py | |
parent | 74f597fec6a91b8305177461e7c25bb231999e61 (diff) | |
download | external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.tar.gz external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.tar.bz2 external_python_setuptools-451377d0e877fc610d1bdf8181ba70a90e4c14cc.zip |
Detect and handle conflicts with "unmanaged" packages when installing
packages managed by EasyInstall. Also, add an option to exclude source
files from .egg distributions.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041109
Diffstat (limited to 'setuptools/archive_util.py')
-rwxr-xr-x | setuptools/archive_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py index 4def0a70..d24c6c13 100755 --- a/setuptools/archive_util.py +++ b/setuptools/archive_util.py @@ -8,8 +8,9 @@ __all__ = [ import zipfile, tarfile, os from pkg_resources import ensure_directory +from distutils.errors import DistutilsError -class UnrecognizedFormat(RuntimeError): +class UnrecognizedFormat(DistutilsError): """Couldn't recognize the archive type""" def default_filter(src,dst): @@ -38,7 +39,6 @@ def default_filter(src,dst): - def unpack_archive(filename, extract_dir, progress_filter=default_filter, drivers=None ): |