diff options
| -rw-r--r-- | man/emerge.1 | 11 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 15 |
3 files changed, 28 insertions, 4 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index fac737799..1e6b42392 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -248,6 +248,17 @@ is not a tty (by default, color is disabled unless stdout is a tty). Used alongside \fB\-\-pretend\fR to cause the package name, new version, and old version to be displayed in an aligned format for easy cut\-n\-paste. .TP +.BR "\-\-complete\-graph" +This causes \fBemerge\fR to consider the deep dependencies of all +packages from the system and world sets. With this option enabled, +\fBemerge\fR 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 \fB\-\-deep\fR option, the \fB\-\-complete\-graph\fR +option will significantly increase the time taken for dependency +calculations. Note that, unlike the \fB\-\-deep\fR option, the +\fB\-\-complete\-graph\fR option does not cause any more packages to +be updated than would have otherwise been updated with the option disabled. +.TP .BR \-\-config\-root=DIR Set the \fBPORTAGE_CONFIGROOT\fR environment variable. .TP diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index eae47628f..a7d397e9b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -188,7 +188,7 @@ options=[ "--ask", "--alphabetical", "--buildpkg", "--buildpkgonly", "--changelog", "--columns", -"--consistent", +"--complete-graph", "--debug", "--deep", "--digest", "--emptytree", @@ -381,7 +381,7 @@ def create_depgraph_params(myopts, myaction): myparams.discard("recurse") if "--deep" in myopts: myparams.add("deep") - if "--consistent" in myopts: + if "--complete-graph" in myopts: myparams.add("consistent") return myparams @@ -2842,7 +2842,7 @@ class depgraph(object): intially satisfied. Since this method can consume enough time to disturb users, it is - currently only enabled by the --consistent option. + currently only enabled by the --complete-graph option. """ if "consistent" not in self.myparams: # Skip this to avoid consuming enough time to disturb users. diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 4c7505da1..b6bc541cd 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.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," |