depgraph: in complete mode respect --with-bdeps

If you want the graph as complete as possible, now you'll have to use
--with-bdeps=y together with --complete-graph.

diff --git a/man/emerge.1 b/man/emerge.1
index 907bb4f184a9bdde1bb84b1bb297349d1aa7460f..d4cf42dfa2cfc466480d9a194859f0dfc52623cb 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -351,6 +351,8 @@ 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.
+Using \fB\-\-with\-bdeps=y\fR together with \fB\-\-complete\-graph\fR makes
+the graph as complete as possible.
 .TP
 .BR \-\-config\-root=DIR
 Set the \fBPORTAGE_CONFIGROOT\fR environment variable.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b8089ae96067ede86a036d203471d13c5dceb104..3169d198bb87860c94c49d2b7a0de6fe04e90f9c 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1343,11 +1343,10 @@ class depgraph(object):
                                        ignore_build_time_deps = True
 
                # If rebuild mode is not enabled, it's safe to discard ignored
-               # build-time dependencies. However, keep them if "complete" mode
-               # is enabled, since they make the graph more complete.
+               # build-time dependencies. If you want these deps to be traversed
+               # in "complete" mode then you need to specify --with-bdeps=y.
                if ignore_build_time_deps and \
-                       not self._rebuild.rebuild and \
-                       "complete" not in self._dynamic_config.myparams:
+                       not self._rebuild.rebuild:
                        edepend["DEPEND"] = ""
 
                deps = (
@@ -4000,9 +3999,6 @@ class depgraph(object):
                        self._select_package = self._select_pkg_from_installed
                else:
                        self._select_package = self._select_pkg_from_graph
-                       # Make the graph as complete as possible by traversing build-time
-                       # dependencies if they happen to be installed already.
-                       self._dynamic_config.myparams["bdeps"] = "y"
                        self._dynamic_config._traverse_ignored_deps = True
                already_deep = self._dynamic_config.myparams.get("deep") is True
                if not already_deep:

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index de50b7517e9bd0fe6069ab2924058a76e447901a..9de6aade76f2f8fb93b06f0558d97110c3e0815d 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -383,7 +383,10 @@ def help(myopts, havecolor=1):
                        " 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."
+                       " be updated than would have otherwise " + \
+                       "been updated with the option disabled. " + \
+                       "Using --with-bdeps=y together with --complete-graph makes " + \
+                       "the graph as complete as possible."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()