In the --depclean docs, there's no need to advise the user to use --oneshot

when updating @system @world since @system now has world-candidate set to
False by default.

svn path=/main/trunk/; revision=11564

diff --git a/man/emerge.1 b/man/emerge.1
index a14cc615c495fe113133f2ad0c3ca5f2f100e37e..3da39a620f59580dcd19b926221a1c7e87c9306c 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -114,7 +114,7 @@ always be kept. They can be manually added to this set with \fIemerge
 \-\-noreplace <atom>\fR. As a safety measure, depclean will not remove any
 packages unless *all* required dependencies have been resolved. As a
 consequence, it is often necessary to run \fIemerge \-\-update \-\-newuse
-\-\-deep \-\-oneshot @system @world\fR prior to depclean. 
+\-\-deep @system @world\fR prior to depclean. 
 
 \fBWARNING:\fR
 Inexperienced users are advised to use \fB\-\-pretend\fR with this

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 57101aae88dde8a4c52f27477e3da7e0241942ca..4926f042d1b310b6ce76e395ba57890f8b8f052d 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -11909,7 +11909,7 @@ def action_depclean(settings, trees, ldpath_mtimes,
        msg.append("unless *all* required dependencies have been resolved.  As a\n")
        msg.append("consequence, it is often necessary to run %s\n" % \
                good("`emerge --update"))
-       msg.append(good("--newuse --deep --oneshot @system @world`") + \
+       msg.append(good("--newuse --deep @system @world`") + \
                " prior to depclean.\n")
 
        if action == "depclean" and "--quiet" not in myopts and not myfiles:

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 5c7b0d6e6f888a5e1c3ddf4be528a694f9e06f62..05a9803c929e8bbfb6c4910332b9a4d3e43ea652 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -79,7 +79,7 @@ def help(myaction,myopts,havecolor=1):
                "emerge --noreplace <atom>. As a safety measure, depclean " + \
                "will not remove any packages unless *all* required dependencies " + \
                "have been resolved. As a consequence, it is often necessary to " + \
-               "run emerge --update --newuse --deep --oneshot @system @world " + \
+               "run emerge --update --newuse --deep @system @world " + \
                "prior to depclean."
 
                for line in wrap(paragraph, desc_width):