--- emergehelp.py.old 2006-02-04 12:25:09.000000000 +0100 +++ emergehelp.py 2006-02-04 12:30:44.000000000 +0100 @@ -56,6 +56,11 @@ print " "+bold("<=sys-devel/binutils-2.11.92.0.12.3-r1")+" matches" print " binutils-2.11.90.0.7 and binutils-2.11.92.0.12.3-r1" print + print " "+green("--config") + print " Runs package-specific operations that need to be executed after the" + print " emerge process has completed. This usually entails configuration" + print " file setup or other similar setups that the user may wish to run." + print print " "+green("--depclean") print " Cleans the system by removing packages that are not associated" print " with explicitly merged packages. Depclean works by creating the" @@ -94,8 +99,14 @@ print " users as rsync updates the cache using server-side caches." print " Rsync users should simply 'emerge --sync' to regenerate." print + print " "+green("--resume") + print " Resumes the last merge operation. Can be treated just like a" + print " regular merge as --pretend and other options work along side." + print " 'emerge --resume' only returns an error on failure. Nothing to" + print " do exits with a message and a success condition." + print print " "+green("--search")+" ("+green("-s")+" short option)" - print " searches for matches of the supplied string in the current local" + print " Searches for matches of the supplied string in the current local" print " portage tree. The search string is a regular expression. Prepending" print " the expression with a '@' will cause the category to be included in" print " the search." @@ -107,16 +118,31 @@ print " "+bold("emerge search @^dev-java.*jdk") print " list all available Java JDKs" print + print " "+green("--searchdesc")+" ("+green("-S")+" short option)" + print " Matches the search string against the description field as well" + print " the package's name. Take caution as the descriptions are also" + print " matched as regular expressions." + print " emerge -S html" + print " emerge -S applet" + print " emerge -S 'perl.*module'" + print print " "+green("--unmerge")+" ("+green("-C")+" short option)" print " "+turquoise("WARNING: This action can remove important packages!") print " Removes all matching packages "+bold("completely")+" from" print " your system. Specify arguments using the dependency specification" print " format described in the "+bold("--clean")+" action above." print - print " "+green("--config") - print " Run package specific actions needed to be executed after the" - print " emerge process has completed. This usually entails configuration" - print " file setup or other similar setups that the user may wish to run." + print " "+green("--update")+" ("+green("-u")+" short option)" + print " Updates packages to the best version available, which may not" + print " always be the highest version number due to masking for testing" + print " and development. This will also update direct dependencies which" + print " may not what you want. In general use this option only in combi-" + print " nation with the world or system target." + print + print " "+green("--version")+" ("+green("-V")+" short option)" + print " Displays the currently installed version of portage along with" + print " other information useful for quick reference on a system. See" + print " "+bold("emerge info")+" for more advanced information." print print turquoise("Options:") print " "+green("--alphabetical") @@ -200,6 +226,9 @@ print " Tells emerge to include installed packages where USE flags have " print " changed since installation." print + print " "+green("--nocolor") + print " Suppresses color in the output." + print print " "+green("--noconfmem") print " Portage keeps track of files that have been placed into" print " CONFIG_PROTECT directories, and normally it will not merge the" @@ -246,20 +275,6 @@ print " Effects vary, but the general outcome is a reduced or condensed" print " output from portage's displays." print - print " "+green("--resume") - print " Resumes the last merge operation. Can be treated just like a" - print " regular merge as --pretend and other options work along side." - print " 'emerge --resume' only returns an error on failure. Nothing to" - print " do exits with a message and a success condition." - print - print " "+green("--searchdesc")+" ("+green("-S")+" short option)" - print " Matches the search string against the description field as well" - print " the package's name. Take caution as the descriptions are also" - print " matched as regular expressions." - print " emerge -S html" - print " emerge -S applet" - print " emerge -S 'perl.*module'" - print print " "+green("--skipfirst") print " This option is only valid in a resume situation. It removes the" print " first package in the resume list so that a merge may continue in" @@ -273,13 +288,6 @@ print " a package's dependencies follow the package. Only really useful" print " in combination with --emptytree, --update or --deep." print - print " "+green("--update")+" ("+green("-u")+" short option)" - print " Updates packages to the best version available, which may not" - print " always be the highest version number due to masking for testing" - print " and development. This will also update direct dependencies which" - print " may not what you want. In general use this option only in combi-" - print " nation with the world or system target." - print print " "+green("--usepkg")+" ("+green("-k")+" short option)" print " Tell emerge to use binary packages (from $PKGDIR) if they are" print " available, thus possibly avoiding some time-consuming compiles." @@ -297,11 +305,6 @@ print " Effects vary, but the general outcome is an increased or expanded" print " display of content in portage's displays." print - print " "+green("--version")+" ("+green("-V")+" short option)" - print " Displays the currently installed version of portage along with" - print " other information useful for quick reference on a system. See" - print " "+bold("emerge info")+" for more advanced information." - print elif myaction in ["rsync","sync"]: print print bold("Usage: ")+turquoise("emerge")+" "+turquoise("--sync")