Bug #211833 - When an ebuild removal phase fails, notify the user that

removal of environment.bz2 file will cause the ebuild to be sourced and
eclasses from the current portage tree will be used when necessary.

svn path=/main/trunk/; revision=10009

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 86c26baf94eee3b34b02a882d07c8d3b5b8488b9..02b1484172c9b12c4a5ce2122be61fd7e87da9eb 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1305,7 +1305,14 @@ class dblink(object):
                                                        "The problem occurred while executing " + \
                                                        ("the ebuild located at '%s'. " % myebuildpath) + \
                                                        "If necessary, manually remove the ebuild " + \
-                                                       "in order to skip the execution of removal phases."
+                                                       "and/or the environment.bz2 file which " + \
+                                                       "is located in the same directory. Removal " + \
+                                                       "of the environment.bz2 file will cause " + \
+                                                       "the ebuild to be sourced and eclasses " + \
+                                                       "from the current portage tree will be used " + \
+                                                       "when necessary. Removal of " + \
+                                                       "the ebuild will cause the execution of " + \
+                                                       "removal phases to be skipped entirely."
                                                        from portage.elog.messages import eerror
                                                        from textwrap import wrap
                                                        for l in wrap(msg, 72):