summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/help.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-16 22:47:55 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-16 22:47:55 +0000
commit476f06d82b3a199f651b89b83779c723a6980c2b (patch)
tree42511eea224e65e7cb1e3f6fab58b2e36c412ffb /pym/_emerge/help.py
parentacbf44ae32b2e30a472accce4bd416db45355207 (diff)
downloadportage-476f06d82b3a199f651b89b83779c723a6980c2b.tar.gz
portage-476f06d82b3a199f651b89b83779c723a6980c2b.tar.bz2
portage-476f06d82b3a199f651b89b83779c723a6980c2b.zip
Bug #266454 - Make @world an all-inclusive set once again, like it was prior
to portage-2.2_rc* releases. In addition to @system, @world now includes a @selected set which represents user-selected "world" packages and sets that saved in /var/lib/portage/world{,sets}. svn path=/main/trunk/; revision=14614
Diffstat (limited to 'pym/_emerge/help.py')
-rw-r--r--pym/_emerge/help.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index e2c7a80ea..50145dad5 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -70,8 +70,8 @@ def help(myopts, havecolor=1):
paragraph = "Cleans the system by removing packages that are " + \
"not associated with explicitly merged packages. Depclean works " + \
- "by creating the full dependency tree from the @system and " + \
- "@world sets, then comparing it to installed packages. Packages " + \
+ "by creating the full dependency tree from the " + \
+ "@world set, then comparing it to installed packages. Packages " + \
"installed, but not part of the dependency tree, will be " + \
"uninstalled by depclean. See --with-bdeps for behavior with " + \
"respect to build time dependencies that are not strictly " + \
@@ -80,7 +80,7 @@ def help(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 @system @world " + \
+ "run emerge --update --newuse --deep @world " + \
"prior to depclean."
for line in wrap(paragraph, desc_width):
@@ -312,7 +312,7 @@ def help(myopts, havecolor=1):
print()
print(" "+green("--complete-graph") + "[=%s]" % turquoise("n"))
desc = "This causes emerge to consider the deep dependencies of all" + \
- " packages from the system and world sets. With this option enabled," + \
+ " packages from the world set. With this option enabled," + \
" emerge will bail out if it determines that the given operation will" + \
" break any dependencies of the packages that have been added to the" + \
" graph. Like the --deep option, the --complete-graph" + \