| 1 |
commit: 0fe2340f8bb892447768b64dfe2970a7be760107 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 31 19:52:01 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 31 19:52:01 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0fe2340f |
| 7 |
|
| 8 |
Merge commit 'v2.2.0_alpha72' into multilib |
| 9 |
|
| 10 |
|
| 11 |
bin/ebuild | 4 +- |
| 12 |
bin/egencache | 87 ++++-- |
| 13 |
bin/emaint | 22 +- |
| 14 |
bin/glsa-check | 5 +- |
| 15 |
bin/lock-helper.py | 4 +- |
| 16 |
bin/portageq | 81 +++-- |
| 17 |
bin/quickpkg | 24 +- |
| 18 |
bin/regenworld | 5 +- |
| 19 |
bin/repoman | 11 +- |
| 20 |
bin/xpak-helper.py | 4 +- |
| 21 |
man/emerge.1 | 4 + |
| 22 |
man/make.conf.5 | 9 +- |
| 23 |
man/portage.5 | 12 +- |
| 24 |
pym/_emerge/BlockerDB.py | 5 +- |
| 25 |
pym/_emerge/EbuildFetchonly.py | 4 +- |
| 26 |
pym/_emerge/EbuildMetadataPhase.py | 6 +- |
| 27 |
pym/_emerge/FakeVartree.py | 11 +- |
| 28 |
pym/_emerge/Package.py | 8 +- |
| 29 |
pym/_emerge/RootConfig.py | 2 +- |
| 30 |
pym/_emerge/Scheduler.py | 17 +- |
| 31 |
pym/_emerge/actions.py | 304 +++++++---------- |
| 32 |
pym/_emerge/depgraph.py | 33 +- |
| 33 |
pym/_emerge/main.py | 46 ++- |
| 34 |
pym/_emerge/unmerge.py | 4 +- |
| 35 |
pym/portage/__init__.py | 42 ++- |
| 36 |
pym/portage/_global_updates.py | 2 +- |
| 37 |
pym/portage/_legacy_globals.py | 12 +- |
| 38 |
pym/portage/_sets/__init__.py | 38 ++- |
| 39 |
pym/portage/cache/metadata.py | 1 - |
| 40 |
pym/portage/cache/template.py | 5 + |
| 41 |
pym/portage/checksum.py | 41 ++- |
| 42 |
pym/portage/dbapi/_expand_new_virt.py | 3 +- |
| 43 |
pym/portage/dbapi/bintree.py | 35 ++- |
| 44 |
pym/portage/dbapi/porttree.py | 43 ++- |
| 45 |
pym/portage/dbapi/vartree.py | 110 +++++-- |
| 46 |
pym/portage/dep/dep_check.py | 8 +- |
| 47 |
pym/portage/elog/mod_syslog.py | 2 +- |
| 48 |
pym/portage/news.py | 74 ++++- |
| 49 |
.../package/ebuild/_config/KeywordsManager.py | 6 +- |
| 50 |
.../package/ebuild/_config/LocationsManager.py | 83 ++++- |
| 51 |
pym/portage/package/ebuild/_config/MaskManager.py | 37 ++- |
| 52 |
pym/portage/package/ebuild/_config/UseManager.py | 18 +- |
| 53 |
pym/portage/package/ebuild/config.py | 96 +++--- |
| 54 |
pym/portage/package/ebuild/digestcheck.py | 2 +- |
| 55 |
pym/portage/package/ebuild/doebuild.py | 25 +- |
| 56 |
pym/portage/repository/config.py | 358 +++++++++++++------- |
| 57 |
pym/portage/tests/ebuild/test_config.py | 8 +- |
| 58 |
pym/portage/tests/ebuild/test_doebuild_spawn.py | 2 +- |
| 59 |
pym/portage/tests/emerge/test_simple.py | 39 ++- |
| 60 |
pym/portage/tests/repoman/test_simple.py | 2 +- |
| 61 |
pym/portage/tests/resolver/ResolverPlayground.py | 27 +- |
| 62 |
pym/portage/util/__init__.py | 11 +- |
| 63 |
pym/portage/util/env_update.py | 13 +- |
| 64 |
pym/repoman/utilities.py | 4 + |
| 65 |
runtests.sh | 20 ++ |
| 66 |
55 files changed, 1203 insertions(+), 676 deletions(-) |
| 67 |
|
| 68 |
diff --cc pym/_emerge/actions.py |
| 69 |
index d8f9032,af3780e..66204b6 |
| 70 |
--- a/pym/_emerge/actions.py |
| 71 |
+++ b/pym/_emerge/actions.py |
| 72 |
@@@ -1464,11 -1468,7 +1468,8 @@@ def action_info(settings, trees, myopts |
| 73 |
|
| 74 |
myvars = portage.util.unique_array(myvars) |
| 75 |
use_expand = settings.get('USE_EXPAND', '').split() |
| 76 |
+ use_expand.append("MULTILIB_ABIS") |
| 77 |
use_expand.sort() |
| 78 |
- use_expand_hidden = set( |
| 79 |
- settings.get('USE_EXPAND_HIDDEN', '').upper().split()) |
| 80 |
- alphabetical_use = '--alphabetical' in myopts |
| 81 |
unset_vars = [] |
| 82 |
myvars.sort() |
| 83 |
for k in myvars: |
| 84 |
diff --cc pym/_emerge/main.py |
| 85 |
index e5ba5e1,52e4c42..534d0ea |
| 86 |
--- a/pym/_emerge/main.py |
| 87 |
+++ b/pym/_emerge/main.py |
| 88 |
@@@ -1639,16 -1642,11 +1642,16 @@@ def emerge_main(args=None) |
| 89 |
adjust_configs(myopts, trees) |
| 90 |
apply_priorities(settings) |
| 91 |
|
| 92 |
+ if settings.get("NO_AUTO_FLAG", "") is "": |
| 93 |
+ writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1) |
| 94 |
+ writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1) |
| 95 |
+ return 1 |
| 96 |
+ |
| 97 |
if myaction == 'version': |
| 98 |
writemsg_stdout(getportageversion( |
| 99 |
- settings["PORTDIR"], settings["ROOT"], |
| 100 |
+ settings["PORTDIR"], None, |
| 101 |
settings.profile_path, settings["CHOST"], |
| 102 |
- trees[settings["ROOT"]]["vartree"].dbapi) + '\n', noiselevel=-1) |
| 103 |
+ trees[settings['EROOT']]['vartree'].dbapi) + '\n', noiselevel=-1) |
| 104 |
return 0 |
| 105 |
elif myaction == 'help': |
| 106 |
_emerge.help.help() |
| 107 |
diff --cc pym/portage/package/ebuild/config.py |
| 108 |
index ceb5154,765a4f7..ee6253f |
| 109 |
--- a/pym/portage/package/ebuild/config.py |
| 110 |
+++ b/pym/portage/package/ebuild/config.py |
| 111 |
@@@ -424,16 -430,14 +430,16 @@@ class config(object) |
| 112 |
mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults"), |
| 113 |
expand=expand_map) for x in self.profiles] |
| 114 |
self._make_defaults = mygcfg_dlists |
| 115 |
- self.mygcfg = stack_dicts(mygcfg_dlists, |
| 116 |
+ mygcfg = stack_dicts(mygcfg_dlists, |
| 117 |
incrementals=self.incrementals) |
| 118 |
- if self.mygcfg is None: |
| 119 |
- self.mygcfg = {} |
| 120 |
- self.configlist.append(self.mygcfg) |
| 121 |
+ if mygcfg is None: |
| 122 |
+ mygcfg = {} |
| 123 |
+ self.configlist.append(mygcfg) |
| 124 |
self.configdict["defaults"]=self.configlist[-1] |
| 125 |
+ if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0: |
| 126 |
+ self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 127 |
|
| 128 |
- self.mygcfg = getconfig( |
| 129 |
+ mygcfg = getconfig( |
| 130 |
os.path.join(config_root, MAKE_CONF_FILE), |
| 131 |
tolerant=tolerant, allow_sourcing=True, |
| 132 |
expand=expand_map) or {} |
Archives