From 451377d0e877fc610d1bdf8181ba70a90e4c14cc Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Sun, 10 Jul 2005 04:49:31 +0000 Subject: 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 --- setuptools/archive_util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/archive_util.py') 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): @@ -36,7 +37,6 @@ def default_filter(src,dst): - def unpack_archive(filename, extract_dir, progress_filter=default_filter, -- cgit v1.2.3