* [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
@ 2011-02-06 13:10 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2011-02-06 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 676c6b3845482730d1dec4d683bc6138a5f30727
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 06:28:35 2011 +0000
Commit: Thomas Sachau <tommy <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):
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
@ 2011-02-06 13:10 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2011-02-06 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 3b72417b30868335b3314559028f04a62a4b5521
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 22:59:28 2011 +0000
Commit: Thomas Sachau <tommy <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 \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
@ 2011-02-06 13:10 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2011-02-06 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 99883fc79e984177d7c5a1e245518f1d76e3e990
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 00:27:25 2011 +0000
Commit: Thomas Sachau <tommy <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:
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
@ 2012-02-26 16:27 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2012-02-26 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 0dc919c29eecc249b37bf98556869d6159717935
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 12:30:46 2012 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 12:30:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0dc919c2
dep_check.py: Move multilib behind force-multilib FEATURE
---
pym/portage/dep/dep_check.py | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 3dc421b..ef6d6bf 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -69,20 +69,21 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
if repoman:
x = x._eval_qa_conditionals(use_mask, use_force)
- if not repoman :
- for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '):
- if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None):
- if ']' in x:
- x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]')
- else:
- x = str(x) + '[multilib_abi_' + multilib_abis + '?]'
- try:
- x = portage.dep.Atom(x)
- x = x.evaluate_conditionals(myuse)
- except portage.exception.InvalidAtom:
- if portage.dep._dep_check_strict:
- raise portage.exception.ParseError(
- "invalid atom: '%s'" % x)
+ if 'force-multilib' in mysettings.get("FEATURES", ''):
+ if not repoman :
+ for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '):
+ if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None):
+ if ']' in x:
+ x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]')
+ else:
+ x = str(x) + '[multilib_abi_' + multilib_abis + '?]'
+ try:
+ x = portage.dep.Atom(x)
+ x = x.evaluate_conditionals(myuse)
+ except portage.exception.InvalidAtom:
+ if portage.dep._dep_check_strict:
+ raise portage.exception.ParseError(
+ "invalid atom: '%s'" % x)
mykey = x.cp
if not mykey.startswith("virtual/"):
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
@ 2015-10-04 15:32 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-10-04 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 259272b9ffcf2c3d813487bf0119f761f32476e6
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 13:23:22 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 13:23:22 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=259272b9
Convert forced flags from new multilib eclass to the matching ones from multilib-portage
pym/portage/dep/dep_check.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index dab6961..4e97ffa 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -84,11 +84,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
use_tokens = []
else:
use_tokens = list(x.unevaluated_atom.use.tokens)
+ if 'abi_x86_64' in use_tokens:
+ use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64'
+ if 'abi_x86_32' in use_tokens:
+ use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86'
use_tokens.extend(multilib_flags)
x = Atom(x.unevaluated_atom.without_use +
"[%s]" % (",".join(use_tokens)))
x = x.evaluate_conditionals(myuse)
-
mykey = x.cp
if not mykey.startswith("virtual/"):
newsplit.append(x)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-04 15:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-26 16:27 [gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2015-10-04 15:32 Thomas Sachau
2011-02-06 13:10 Thomas Sachau
2011-02-06 13:10 Thomas Sachau
2011-02-06 13:10 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox