From: Zac Medico Date: Sat, 27 Sep 2008 05:55:10 +0000 (-0000) Subject: In the --depclean docs, there's no need to advise the user to use --oneshot X-Git-Tag: v2.2_rc12~76 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a99623b24fb20fda28ede4dc6a82d42bab3f1078;p=portage.git 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 a14cc615c..3da39a620 100644 --- 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 \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 57101aae8..4926f042d 100644 --- 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 5c7b0d6e6..05a9803c9 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -79,7 +79,7 @@ def help(myaction,myopts,havecolor=1): "emerge --noreplace . 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):