summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-28 17:25:48 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-28 17:25:48 +0000
commit66dad7ad86652a54e1852e9df453b368194a1fe6 (patch)
treeacff78afd0f88acf69637e57c5865bb861df318c /pym
parentb8aa72e58955872f4e366d50839a5d1e995121bb (diff)
downloadportage-66dad7ad86652a54e1852e9df453b368194a1fe6.tar.gz
portage-66dad7ad86652a54e1852e9df453b368194a1fe6.tar.bz2
portage-66dad7ad86652a54e1852e9df453b368194a1fe6.zip
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
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py12
1 files changed, 7 insertions, 5 deletions
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: