| 1 |
commit: 0dc919c29eecc249b37bf98556869d6159717935 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 12:30:46 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 12:30:46 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0dc919c2 |
| 7 |
|
| 8 |
dep_check.py: Move multilib behind force-multilib FEATURE |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dep/dep_check.py | 29 +++++++++++++++-------------- |
| 12 |
1 files changed, 15 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 15 |
index 3dc421b..ef6d6bf 100644 |
| 16 |
--- a/pym/portage/dep/dep_check.py |
| 17 |
+++ b/pym/portage/dep/dep_check.py |
| 18 |
@@ -69,20 +69,21 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 19 |
if repoman: |
| 20 |
x = x._eval_qa_conditionals(use_mask, use_force) |
| 21 |
|
| 22 |
- if not repoman : |
| 23 |
- for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '): |
| 24 |
- if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None): |
| 25 |
- if ']' in x: |
| 26 |
- x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]') |
| 27 |
- else: |
| 28 |
- x = str(x) + '[multilib_abi_' + multilib_abis + '?]' |
| 29 |
- try: |
| 30 |
- x = portage.dep.Atom(x) |
| 31 |
- x = x.evaluate_conditionals(myuse) |
| 32 |
- except portage.exception.InvalidAtom: |
| 33 |
- if portage.dep._dep_check_strict: |
| 34 |
- raise portage.exception.ParseError( |
| 35 |
- "invalid atom: '%s'" % x) |
| 36 |
+ if 'force-multilib' in mysettings.get("FEATURES", ''): |
| 37 |
+ if not repoman : |
| 38 |
+ for multilib_abis in mysettings.get("MULTILIB_ABIS", '').split(' '): |
| 39 |
+ if multilib_abis not in ("multilib_abi_" + x) and portage.dep_getkey(x) not in mysettings.get("NO_AUTO_FLAG", None): |
| 40 |
+ if ']' in x: |
| 41 |
+ x = str(x).replace(']',',multilib_abi_' + multilib_abis + '?]') |
| 42 |
+ else: |
| 43 |
+ x = str(x) + '[multilib_abi_' + multilib_abis + '?]' |
| 44 |
+ try: |
| 45 |
+ x = portage.dep.Atom(x) |
| 46 |
+ x = x.evaluate_conditionals(myuse) |
| 47 |
+ except portage.exception.InvalidAtom: |
| 48 |
+ if portage.dep._dep_check_strict: |
| 49 |
+ raise portage.exception.ParseError( |
| 50 |
+ "invalid atom: '%s'" % x) |
| 51 |
|
| 52 |
mykey = x.cp |
| 53 |
if not mykey.startswith("virtual/"): |
Archives