Merging the resource branch !

1 files changed, 8 insertions, 1 deletions

diff --git a/distutils2/errors.py b/distutils2/errors.py
index 4b006b3..bbf5497 100644
--- a/distutils2/errors.py
+++ b/distutils2/errors.py
@@ -9,7 +9,6 @@ This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
 
-
 class DistutilsError(Exception):
     """The root of all Distutils evil."""
 
@@ -135,3 +134,11 @@ class HugeMajorVersionNumError(IrrationalVersionError):
     This guard can be disabled by setting that option False.
     """
     pass
+
+
+class InstallationException(Exception):
+    """Base exception for installation scripts"""
+
+
+class InstallationConflict(InstallationException):
+    """Raised when a conflict is detected"""