summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-20 02:23:33 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-20 02:23:33 +0000
commit1fcfb58b23408da0352c2c08b63bab3d0e86706e (patch)
tree531261e420c4984a20a43a8422527400824fd161
parentFix --prune so that it always correctly accounts for COUNTER when dealing wit... (diff)
downloadportage-idfetch-1fcfb58b23408da0352c2c08b63bab3d0e86706e.tar.gz
portage-idfetch-1fcfb58b23408da0352c2c08b63bab3d0e86706e.tar.bz2
portage-idfetch-1fcfb58b23408da0352c2c08b63bab3d0e86706e.zip
Update --prune docs for bug #151653.
svn path=/main/trunk/; revision=7315
-rw-r--r--man/emerge.110
-rw-r--r--pym/emerge/help.py2
2 files changed, 5 insertions, 7 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index ed38ed66..db51d331 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -125,12 +125,10 @@ package data. It does not populate cache for the overlays listed in
PORTDIR_OVERLAY. In order to generate cache for overlays, use \fB\-\-regen\fR.
.TP
.BR "\-\-prune " (\fB\-P\fR)
-\fBWARNING: This action can remove important packages!\fR Prune looks at each
-installed package and attempts to \fBremove\fR all but the \fBmost recently
-installed version. \fRPrune ignores \fBslots\fR, if you require a slot\-aware
-Prune use \fB emerge \-\-clean\fR. Prune may inadvertently remove important
-packages from your system. Use \fB\-\-clean\fR instead unless you really
-know what you're doing.
+\fBWARNING: This action can remove important packages!\fR Removes all but the
+highest installed version of a package from your system. This action doesn't
+verify the possible binary compatibility between versions and can thus remove
+essential dependencies from your system.
.TP
.BR \-\-regen
Causes portage to check and update the dependency cache of all ebuilds in the
diff --git a/pym/emerge/help.py b/pym/emerge/help.py
index 7502d423..def367fd 100644
--- a/pym/emerge/help.py
+++ b/pym/emerge/help.py
@@ -87,7 +87,7 @@ def help(myaction,myopts,havecolor=1):
print
print " "+green("--prune")+" ("+green("-P")+" short option)"
print " "+turquoise("WARNING: This action can remove important packages!")
- print " Removes all but the most recently installed version of a package"
+ print " Removes all but the highest installed version of a package"
print " from your system. This action doesn't verify the possible binary"
print " compatibility between versions and can thus remove essential"
print " dependencies from your system."