From 6844c042c68b368d3ef608f31ebdf3dd8f70b7be Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Apr 2008 23:05:00 +0000 Subject: Rename the undocumented --conistent option to --complete-graph and add some docs. (trunk r9846) svn path=/main/branches/2.1.2/; revision=9847 --- pym/emergehelp.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 99b1cbb60..038db6784 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -17,7 +17,7 @@ def shorthelp(): print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhkKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]" print " [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]" print " [ "+green("--reinstall ")+turquoise("changed-use")+" ] ["+green("--nospinner")+"]" - print " [ "+green("--deep")+" ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]" + print " [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]" print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]" def help(myaction,myopts,havecolor=1): @@ -220,6 +220,19 @@ def help(myaction,myopts,havecolor=1): print " Display the pretend output in a tabular form. Versions are" print " aligned vertically." print + print " "+green("--complete-graph") + desc = "This causes emerge to consider the deep dependencies of all" + \ + " packages from the system and world sets. 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" + \ + " option will significantly increase the time taken for dependency" + \ + " calculations. Note that, unlike the --deep option, the" + \ + " --complete-graph option does not cause any more packages to" + \ + " be updated than would have otherwise been updated with the option disabled." + for line in wrap(desc, desc_width): + print desc_indent + line + print print " "+green("--debug")+" ("+green("-d")+" short option)" print " Tell emerge to run the ebuild command in --debug mode. In this" print " mode, the bash build environment will run with the -x option," -- cgit v1.2.3-1-g7c22