From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 28 Apr 2008 01:46:58 +0000 (-0000)
Subject: Bug #211833 - When an ebuild removal phase fails, notify the user that
X-Git-Tag: v2.1.5~129
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f62216a1162c1cee8efd7f6f1229ac9c5339a14;p=portage.git

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 9dd0ecd92..9b5f0ff54 100644
--- 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