From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 28 Apr 2008 17:25:48 +0000 (-0000)
Subject: As suggested by  Chr. Schaefer in bug #211833, comment  #15, note that
X-Git-Tag: v2.1.5~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66dad7ad86652a54e1852e9df453b368194a1fe6;p=portage.git

As suggested by  Chr. Schaefer in bug #211833, comment  #15, note that
removal of the environment.bz2 file is preferred since it may allow the
removal phases to execute successfully. (trunk r10022)

svn path=/main/branches/2.1.2/; revision=10023
---

diff --git a/pym/portage.py b/pym/portage.py
index 673e75e03..81f6ff938 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8689,20 +8689,22 @@ class dblink:
 							("located in the '%s' directory. " \
 							% ebuild_dir) + \
 							"If necessary, manually remove " + \
-							"the ebuild file and/or the environment.bz2 " + \
-							"file located in that directory."
+							"the environment.bz2 file and/or the " + \
+							"ebuild file located in that directory."
 							msg_lines.extend(wrap(msg, 72))
 							msg_lines.append("")
 
 							msg = "Removal " + \
-							"of the environment.bz2 file will cause " + \
-							"the ebuild to be sourced and the eclasses " + \
+							"of the environment.bz2 file is " + \
+							"preferred since it may allow the " + \
+							"removal phases to execute successfully. " + \
+							"The ebuild will be " + \
+							"sourced and the eclasses " + \
 							"from the current portage tree will be used " + \
 							"when necessary. Removal of " + \
 							"the ebuild file will cause the " + \
 							"removal phases to be skipped entirely."
 							msg_lines.extend(wrap(msg, 72))
-							from textwrap import wrap
 							cmd = "source '%s/isolated-functions.sh' ; " % \
 								PORTAGE_BIN_PATH
 							for l in msg_lines: