| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-28 17:25:48 +0000 (Mon, 28 Apr 2008) |
| 3 |
New Revision: 10023 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
As suggested by Chr. Schaefer in bug #211833, comment #15, note that |
| 9 |
removal of the environment.bz2 file is preferred since it may allow the |
| 10 |
removal phases to execute successfully. (trunk r10022) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/pym/portage.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/pym/portage.py 2008-04-28 17:20:42 UTC (rev 10022) |
| 16 |
+++ main/branches/2.1.2/pym/portage.py 2008-04-28 17:25:48 UTC (rev 10023) |
| 17 |
@@ -8689,20 +8689,22 @@ |
| 18 |
("located in the '%s' directory. " \ |
| 19 |
% ebuild_dir) + \ |
| 20 |
"If necessary, manually remove " + \ |
| 21 |
- "the ebuild file and/or the environment.bz2 " + \ |
| 22 |
- "file located in that directory." |
| 23 |
+ "the environment.bz2 file and/or the " + \ |
| 24 |
+ "ebuild file located in that directory." |
| 25 |
msg_lines.extend(wrap(msg, 72)) |
| 26 |
msg_lines.append("") |
| 27 |
|
| 28 |
msg = "Removal " + \ |
| 29 |
- "of the environment.bz2 file will cause " + \ |
| 30 |
- "the ebuild to be sourced and the eclasses " + \ |
| 31 |
+ "of the environment.bz2 file is " + \ |
| 32 |
+ "preferred since it may allow the " + \ |
| 33 |
+ "removal phases to execute successfully. " + \ |
| 34 |
+ "The ebuild will be " + \ |
| 35 |
+ "sourced and the eclasses " + \ |
| 36 |
"from the current portage tree will be used " + \ |
| 37 |
"when necessary. Removal of " + \ |
| 38 |
"the ebuild file will cause the " + \ |
| 39 |
"removal phases to be skipped entirely." |
| 40 |
msg_lines.extend(wrap(msg, 72)) |
| 41 |
- from textwrap import wrap |
| 42 |
cmd = "source '%s/isolated-functions.sh' ; " % \ |
| 43 |
PORTAGE_BIN_PATH |
| 44 |
for l in msg_lines: |
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives