diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-10 02:53:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-10 02:53:48 +0000 |
| commit | 4757bd35890cdbe0456188394bfc5306566bceaf (patch) | |
| tree | d9cedd4cd14a4af67fb7e76df3c5252247c4a4c4 | |
| parent | 523ff36ba4c6c2dd82dc5f5188b0fad9799186e6 (diff) | |
| download | portage-4757bd35890cdbe0456188394bfc5306566bceaf.tar.gz portage-4757bd35890cdbe0456188394bfc5306566bceaf.tar.bz2 portage-4757bd35890cdbe0456188394bfc5306566bceaf.zip | |
Don't trigger the --root-deps code for removal actions such as --prune and
--depclean.
svn path=/main/trunk/; revision=13971
| -rw-r--r-- | pym/_emerge/depgraph.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a8ed267e7..7de993464 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1014,15 +1014,16 @@ class depgraph(object): if removal_action and self._frozen_config.myopts.get("--with-bdeps", "y") == "n": edepend["DEPEND"] = "" - bdeps_root = "/" if removal_action: bdeps_root = myroot - root_deps = self._frozen_config.myopts.get("--root-deps") - if root_deps is not None: - if root_deps is True: - bdeps_root = myroot - elif root_deps == "rdeps": - edepend["DEPEND"] = "" + else: + bdeps_root = "/" + root_deps = self._frozen_config.myopts.get("--root-deps") + if root_deps is not None: + if root_deps is True: + bdeps_root = myroot + elif root_deps == "rdeps": + edepend["DEPEND"] = "" deps = ( (bdeps_root, edepend["DEPEND"], |