From 4757bd35890cdbe0456188394bfc5306566bceaf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 10 Aug 2009 02:53:48 +0000 Subject: Don't trigger the --root-deps code for removal actions such as --prune and --depclean. svn path=/main/trunk/; revision=13971 --- pym/_emerge/depgraph.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pym/_emerge/depgraph.py') 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"], -- cgit v1.2.3-1-g7c22