| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-27 05:55:10 +0000 (Sat, 27 Sep 2008) |
| 3 |
New Revision: 11564 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/man/emerge.1 |
| 7 |
main/trunk/pym/_emerge/__init__.py |
| 8 |
main/trunk/pym/_emerge/help.py |
| 9 |
Log: |
| 10 |
In the --depclean docs, there's no need to advise the user to use --oneshot |
| 11 |
when updating @system @world since @system now has world-candidate set to |
| 12 |
False by default. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/man/emerge.1 |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/man/emerge.1 2008-09-27 00:08:42 UTC (rev 11563) |
| 18 |
+++ main/trunk/man/emerge.1 2008-09-27 05:55:10 UTC (rev 11564) |
| 19 |
@@ -114,7 +114,7 @@ |
| 20 |
\-\-noreplace <atom>\fR. As a safety measure, depclean will not remove any |
| 21 |
packages unless *all* required dependencies have been resolved. As a |
| 22 |
consequence, it is often necessary to run \fIemerge \-\-update \-\-newuse |
| 23 |
-\-\-deep \-\-oneshot @system @world\fR prior to depclean. |
| 24 |
+\-\-deep @system @world\fR prior to depclean. |
| 25 |
|
| 26 |
\fBWARNING:\fR |
| 27 |
Inexperienced users are advised to use \fB\-\-pretend\fR with this |
| 28 |
|
| 29 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 30 |
=================================================================== |
| 31 |
--- main/trunk/pym/_emerge/__init__.py 2008-09-27 00:08:42 UTC (rev 11563) |
| 32 |
+++ main/trunk/pym/_emerge/__init__.py 2008-09-27 05:55:10 UTC (rev 11564) |
| 33 |
@@ -11909,7 +11909,7 @@ |
| 34 |
msg.append("unless *all* required dependencies have been resolved. As a\n") |
| 35 |
msg.append("consequence, it is often necessary to run %s\n" % \ |
| 36 |
good("`emerge --update")) |
| 37 |
- msg.append(good("--newuse --deep --oneshot @system @world`") + \ |
| 38 |
+ msg.append(good("--newuse --deep @system @world`") + \ |
| 39 |
" prior to depclean.\n") |
| 40 |
|
| 41 |
if action == "depclean" and "--quiet" not in myopts and not myfiles: |
| 42 |
|
| 43 |
Modified: main/trunk/pym/_emerge/help.py |
| 44 |
=================================================================== |
| 45 |
--- main/trunk/pym/_emerge/help.py 2008-09-27 00:08:42 UTC (rev 11563) |
| 46 |
+++ main/trunk/pym/_emerge/help.py 2008-09-27 05:55:10 UTC (rev 11564) |
| 47 |
@@ -79,7 +79,7 @@ |
| 48 |
"emerge --noreplace <atom>. As a safety measure, depclean " + \ |
| 49 |
"will not remove any packages unless *all* required dependencies " + \ |
| 50 |
"have been resolved. As a consequence, it is often necessary to " + \ |
| 51 |
- "run emerge --update --newuse --deep --oneshot @system @world " + \ |
| 52 |
+ "run emerge --update --newuse --deep @system @world " + \ |
| 53 |
"prior to depclean." |
| 54 |
|
| 55 |
for line in wrap(paragraph, desc_width): |
Archives