From d7009b7d2693eae264c1f15ffd44edb4fa37da0c Mon Sep 17 00:00:00 2001 From: Alec Warner Date: Fri, 3 Feb 2006 16:55:31 +0000 Subject: This should have been excluded... svn path=/main/trunk/; revision=2642 --- pym/emergehelp.py | 49 +++++++++++++------------------------------------ 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 9956a9469..9a80de50d 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -14,7 +14,7 @@ def shorthelp(): print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >" print " "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >" print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]" - print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("sync")+" ] " + print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] " print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]" print " ["+green("--columns")+"] ["+green("--nospinner")+"]" print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]" @@ -323,41 +323,18 @@ def help(myaction,myopts,havecolor=1): print print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system") print - print " \"emerge system\" is a special set defined by your profile." - print " Portage will scan /etc/make.profile/packages and determine what" - print " packages end up in the \"system\" set. The goal of the \"system\"" - print " set is to provide a minimum set of packages for a system to operate." - print " If you wish to check that your system has all it's core components," - print " an \"emerge -p system\" will tell you if you are missing anything." - print " The \"system\" set is also useful for updating core components. One" - print " can do \"emerge --update --deep system\" to update core components" - print " and their dependencies. Also useful is the --emptytree option which" - print " forces a rebuild of the packages in the \"system\" set. In all cases" - print " when the \"system\" set is being used, --ask or --pretend are also" - print " highly recommended due to the fact that the \"system\" set may pull" - print " in large number of packages." - print " Note: The \"system\" set is a subset of the \"world\" set. To update" - print " the packages that you have installed, use the \"world\" set." - print - elif myaction=="world": - print - print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("world") - print - print " \"world\" is a special set that you can give to emerge on the command" - print " line. It will read the file at /var/lib/portage/world and will process" - print " those packages. The \"world\" set also includes all the packages in" - print " the \"system\" set. See the help on the \"system\" set for what is" - print " contained in it. Using the \"world\" set, users can keep their entire" - print " system up to date by doing an \"emerge --update --deep world\". This" - print " command tells portage to update all packages in world, as well as their" - print " deep dependencies. Another useful command is \"emerge --newuse world\"" - print " which will emerge any packages that have changed USE flags. In either" - print " case, using --ask or --pretend with the \"world\" set is highly" - print " recommended as the \"world\" set may pull in a large number of packages." - print " Note: The world set is only a subset of all installed packages. Using" - print " the --deep switch with the \"world\" set is important to updating all" - print " package dependencies." - 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=="config": outstuff=green("Config file management support (preliminary)")+""" -- cgit v1.2.3-1-g7c22