aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/sandbox.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-07-10 04:49:31 +0000
committerPJ Eby <distutils-sig@python.org>2005-07-10 04:49:31 +0000
commit451377d0e877fc610d1bdf8181ba70a90e4c14cc (patch)
tree89e0ecc02b8040a747eee92971c0166e63e9e6b2 /setuptools/sandbox.py
parent74f597fec6a91b8305177461e7c25bb231999e61 (diff)
downloadexternal_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/sandbox.py')
-rwxr-xr-xsetuptools/sandbox.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 8aa58f8d..f124289a 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,7 +1,7 @@
import os, sys, __builtin__, tempfile
_os = sys.modules[os.name]
_open = open
-
+from distutils.errors import DistutilsError
__all__ = [
"AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
]
@@ -188,7 +188,7 @@ class DirectorySandbox(AbstractSandbox):
return (src,dst)
-class SandboxViolation(RuntimeError):
+class SandboxViolation(DistutilsError):
"""A setup script attempted to modify the filesystem outside the sandbox"""
def __str__(self):