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.
(trunk r10009)

svn path=/main/branches/2.1.2/; revision=10013

diff --git a/pym/portage.py b/pym/portage.py
index 9dd0ecd92730d494b6219039aaa7cdbdac1ae7a0..9b5f0ff542a75fac9d29e075563e65e0ce23c218 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8680,7 +8680,14 @@ class dblink:
                                                        "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 textwrap import wrap
                                                        cmd = "source '%s/isolated-functions.sh' ; " % \
                                                                PORTAGE_BIN_PATH