diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-25 00:06:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-25 00:06:10 +0000 |
| commit | 53a21c80f7d57cd463af5aac96a08b01775c2465 (patch) | |
| tree | 4f6f3b0b91c934a614605394b38e2bdcca54cc19 | |
| parent | Bug #248599 - Remove remaining references to packages sets and preserve-libs. (diff) | |
| download | portage-53a21c80f7d57cd463af5aac96a08b01775c2465.tar.gz portage-53a21c80f7d57cd463af5aac96a08b01775c2465.tar.bz2 portage-53a21c80f7d57cd463af5aac96a08b01775c2465.zip | |
Remove world and system targets for emerge --help since it no longer works now that
they are sets rather than actions. (trunk r12086)
svn path=/main/branches/2.1.6/; revision=12087
| -rw-r--r-- | man/emerge.1 | 2 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index cef0a721f..c707496cf 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -16,7 +16,7 @@ emerge \- Command\-line interface to the Portage system \fB\-\-search\fR \fIsomestring\fR .TP .BR emerge -\fB\-\-help\fR [\fBsystem\fR | \fBworld\fR | \fB\-\-sync\fR] +\fB\-\-help\fR [\fB\-\-sync\fR] .SH "DESCRIPTION" \fBemerge\fR is the definitive command\-line interface to the Portage system. It is primarily used for installing packages, and \fBemerge\fR diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 42783e0c0..fe034afe0 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -457,32 +457,3 @@ def help(myaction,myopts,havecolor=1): print " exist on it, including ones that you may have created. The exceptions" print " to this are the distfiles, local and packages directories." print - elif myaction=="system": - print - print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system") - print - print " \"emerge system\" is the Portage system update command. When run, it" - print " will scan the etc/make.profile/packages file and determine what" - print " packages need to be installed so that your system meets the minimum" - print " requirements of your current system profile. Note that this doesn't" - print " necessarily bring your system up-to-date at all; instead, it just" - print " ensures that you have no missing parts. For example, if your system" - print " profile specifies that you should have sys-apps/iptables installed" - print " and you don't, then \"emerge system\" will install it (the most" - print " recent version that matches the profile spec) for you. It's always a" - print " good idea to do an \"emerge --pretend system\" before an \"emerge" - print " system\", just so you know what emerge is planning to do." - print - elif myaction=="world": - print - print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("world") - print - print " 'emerge world' is the Portage command for completely updating your" - print " system. The normal procedure is to first do an 'emerge --sync' and" - print " then an 'emerge --update --deep world'. The first command brings your" - print " local Portage tree up-to-date with the latest version information and" - print " ebuilds. The second command then rebuilds all packages for which newer" - print " versions or newer ebuilds have become available since you last did a" - print " sync and update." - print - |