[gentoo-commits] proj/portage:prefix commit in: pym/portage/dep/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/dep/

[Fabian Groffen]

commit:     676c6b3845482730d1dec4d683bc6138a5f30727
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 06:28:35 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 06:28:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=676c6b38

Remove from list by index, not search.

---
 pym/portage/dep/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 68e628b..62e96d2 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2217,7 +2217,7 @@ def check_required_use(required_use, use, iuse_match):
 					node._satisfied = satisfied
 					if node._parent._operator not in ("||", "^^"):
 						offset = node._parent._children.index(node)
-						node._parent._children.remove(node)
+						node._parent._children.pop(offset)
 						for i, child in enumerate(node._children):
 							node._parent._children.insert(offset + i, child)
 							if isinstance(child, _RequiredUseBranch):

[gentoo-commits] proj/portage:prefix commit in: pym/portage/dep/

[Fabian Groffen]

commit:     3b72417b30868335b3314559028f04a62a4b5521
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 22:59:28 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 22:59:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3b72417b

REQUIRED_USE: fix single child conditionals disp

---
 pym/portage/dep/__init__.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b429e56..6b125f0 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2226,15 +2226,14 @@ def check_required_use(required_use, use, iuse_match):
 							node._parent._children.append(child)
 							if isinstance(child, _RequiredUseBranch):
 								child._parent = node._parent
-					node = node._parent
-					continue
 
-				if not node._children:
+				elif not node._children:
 					last_node = node._parent._children.pop()
 					if last_node is not node:
 						raise AssertionError(
 							"node is not last child of parent")
-				elif len(node._children) == 1:
+
+				elif len(node._children) == 1 and op in ("||", "^^"):
 					last_node = node._parent._children.pop()
 					if last_node is not node:
 						raise AssertionError(
@@ -2243,6 +2242,7 @@ def check_required_use(required_use, use, iuse_match):
 					if isinstance(node._children[0], _RequiredUseBranch):
 						node._children[0]._parent = node._parent
 						node = node._children[0]
+
 				else:
 					for index, child in enumerate(node._children):
 						if isinstance(child, _RequiredUseBranch) and \

[gentoo-commits] proj/portage:prefix commit in: pym/portage/dep/

[Fabian Groffen]

commit:     99883fc79e984177d7c5a1e245518f1d76e3e990
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 00:27:25 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 00:27:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=99883fc7

check_required_use: remove obsolete hunk

---
 pym/portage/dep/__init__.py |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 571f6c1..cf83e0a 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2253,15 +2253,6 @@ def check_required_use(required_use, use, iuse_match):
 								node._parent._children.append(child)
 								if isinstance(child, _RequiredUseBranch):
 									child._parent = node._parent
-				else:
-					for index, child in enumerate(node._children):
-						if isinstance(child, _RequiredUseBranch) and \
-							child._operator is None and \
-							len(child._children) == 1:
-							child = child._children[0]
-							node._children[index] = child
-							if isinstance(child, _RequiredUseBranch):
-								child._parent = node
 
 				node = node._parent
 			else: