From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0B71F1381F3 for ; Sun, 4 Aug 2013 11:19:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF52FE0ADF; Sun, 4 Aug 2013 11:19:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BD75E0ADF for ; Sun, 4 Aug 2013 11:19:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0866833ED7B for ; Sun, 4 Aug 2013 11:19:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8724DE468F for ; Sun, 4 Aug 2013 11:19:17 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1375614867.ed2bdce054f8c05045da13241896e2ada5babb6d.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: ed2bdce054f8c05045da13241896e2ada5babb6d X-VCS-Branch: multilib Date: Sun, 4 Aug 2013 11:19:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa1cea8b-27f2-43c6-b7b3-eec4e8a35abd X-Archives-Hash: b3d450dab58d7ea5edd2a7c5ae1fb561 commit: ed2bdce054f8c05045da13241896e2ada5babb6d Author: Thomas Sachau gentoo org> AuthorDate: Sun Aug 4 11:14:27 2013 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sun Aug 4 11:14:27 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ed2bdce0 Merge v2.2.0_alpha192 Makefile | 14 +- RELEASE-NOTES | 8 + bin/bashrc-functions.sh | 4 +- bin/binhost-snapshot | 13 +- bin/chpathtool.py | 11 +- bin/dispatch-conf | 2 +- bin/ebuild | 53 +- bin/ebuild-helpers/dohtml | 2 +- bin/ebuild-helpers/portageq | 2 +- bin/ebuild-helpers/prepstrip | 5 +- bin/ebuild-helpers/{portageq => xattr/install} | 8 +- bin/ebuild-ipc | 2 +- bin/ebuild.sh | 36 +- bin/egencache | 106 ++- bin/emerge-webrsync | 65 +- bin/filter-bash-environment.py | 18 +- bin/fixpackages | 8 + bin/glsa-check | 61 +- bin/helper-functions.sh | 6 +- bin/install.py | 248 +++++++ bin/isolated-functions.sh | 51 +- bin/misc-functions.sh | 4 +- bin/phase-functions.sh | 9 +- bin/phase-helpers.sh | 18 +- bin/portageq | 241 ++++--- bin/quickpkg | 18 +- bin/repoman | 243 +++---- bin/save-ebuild-env.sh | 4 +- bin/xattr-helper.py | 16 +- bin/xpak-helper.py | 6 +- cnf/{make.conf => make.conf.example} | 2 +- ...onf.alpha.diff => make.conf.example.alpha.diff} | 18 +- ...fbsd.diff => make.conf.example.amd64-fbsd.diff} | 18 +- ...onf.amd64.diff => make.conf.example.amd64.diff} | 18 +- ...ke.conf.arm.diff => make.conf.example.arm.diff} | 12 +- ....conf.hppa.diff => make.conf.example.hppa.diff} | 28 +- ....conf.ia64.diff => make.conf.example.ia64.diff} | 10 +- ....conf.m68k.diff => make.conf.example.m68k.diff} | 14 +- ....conf.mips.diff => make.conf.example.mips.diff} | 18 +- ...ke.conf.ppc.diff => make.conf.example.ppc.diff} | 26 +- ...onf.ppc64.diff => make.conf.example.ppc64.diff} | 24 +- ....conf.s390.diff => make.conf.example.s390.diff} | 10 +- ...make.conf.sh.diff => make.conf.example.sh.diff} | 17 +- ...fbsd.diff => make.conf.example.sparc-fbsd.diff} | 12 +- ...onf.sparc.diff => make.conf.example.sparc.diff} | 18 +- ...6-fbsd.diff => make.conf.example.x86-fbsd.diff} | 18 +- ...ke.conf.x86.diff => make.conf.example.x86.diff} | 18 +- cnf/make.globals | 21 +- cnf/repos.conf | 7 + make.conf-repatch.sh | 40 -- make.conf.example-repatch.sh | 41 ++ man/color.map.5 | 16 +- man/dispatch-conf.1 | 2 +- man/ebuild.1 | 18 +- man/ebuild.5 | 86 +-- man/egencache.1 | 23 +- man/emaint.1 | 15 +- man/emerge.1 | 252 ++++--- man/emirrordist.1 | 17 +- man/env-update.1 | 9 +- man/etc-update.1 | 2 +- man/make.conf.5 | 127 ++-- man/portage.5 | 370 ++++++---- man/quickpkg.1 | 14 +- man/repoman.1 | 43 +- man/ru/color.map.5 | 217 ++++++ man/xpak.5 | 5 +- misc/emerge-delta-webrsync | 523 ++++++++++----- pym/_emerge/AbstractDepPriority.py | 5 +- pym/_emerge/AsynchronousLock.py | 2 +- pym/_emerge/Binpkg.py | 6 +- pym/_emerge/DepPriority.py | 29 +- pym/_emerge/DepPrioritySatisfiedRange.py | 24 +- pym/_emerge/EbuildBuild.py | 18 +- pym/_emerge/EbuildMetadataPhase.py | 1 - pym/_emerge/EbuildPhase.py | 44 +- pym/_emerge/MetadataRegen.py | 2 + pym/_emerge/RootConfig.py | 13 +- pym/_emerge/Scheduler.py | 51 +- pym/_emerge/SpawnProcess.py | 3 +- pym/_emerge/UnmergeDepPriority.py | 27 +- pym/_emerge/actions.py | 742 ++++++++++++--------- pym/_emerge/clear_caches.py | 4 +- pym/_emerge/depgraph.py | 184 +++-- pym/_emerge/main.py | 112 ++-- pym/_emerge/resolver/circular_dependency.py | 3 +- pym/portage/__init__.py | 83 +-- pym/portage/_emirrordist/FetchTask.py | 19 +- pym/portage/_emirrordist/main.py | 69 +- pym/portage/_legacy_globals.py | 3 +- pym/portage/_sets/__init__.py | 5 +- pym/portage/cache/sqlite.py | 12 +- pym/portage/cache/template.py | 13 +- pym/portage/checksum.py | 8 +- pym/portage/const.py | 6 + pym/portage/data.py | 18 +- pym/portage/dbapi/_MergeProcess.py | 9 +- pym/portage/dbapi/__init__.py | 57 +- pym/portage/dbapi/bintree.py | 2 +- pym/portage/dbapi/porttree.py | 56 +- pym/portage/dbapi/vartree.py | 12 +- pym/portage/dep/__init__.py | 38 +- pym/portage/dep/dep_check.py | 39 +- pym/portage/dispatch_conf.py | 18 +- pym/portage/eclass_cache.py | 14 +- pym/portage/emaint/defaults.py | 11 +- pym/portage/emaint/main.py | 134 ++-- pym/portage/emaint/modules/logs/__init__.py | 12 +- pym/portage/output.py | 13 +- .../package/ebuild/_config/LocationsManager.py | 33 +- pym/portage/package/ebuild/_config/UseManager.py | 2 +- .../package/ebuild/_config/special_env_vars.py | 20 +- pym/portage/package/ebuild/_spawn_nofetch.py | 10 +- pym/portage/package/ebuild/config.py | 129 ++-- pym/portage/package/ebuild/doebuild.py | 102 ++- pym/portage/package/ebuild/fetch.py | 8 +- pym/portage/package/ebuild/getmaskingreason.py | 12 +- pym/portage/process.py | 67 +- pym/portage/repository/config.py | 414 +++++++++--- pym/portage/tests/__init__.py | 8 +- pym/portage/tests/dbapi/test_fakedbapi.py | 10 +- pym/portage/tests/dbapi/test_portdb_cache.py | 11 +- pym/portage/tests/dep/test_isvalidatom.py | 5 +- pym/portage/tests/dep/test_match_from_list.py | 7 +- pym/portage/tests/ebuild/test_config.py | 20 +- pym/portage/tests/ebuild/test_doebuild_fd_pipes.py | 137 ++++ pym/portage/tests/ebuild/test_spawn.py | 10 +- pym/portage/tests/emerge/test_emerge_slot_abi.py | 4 +- pym/portage/tests/emerge/test_simple.py | 55 +- pym/portage/tests/lint/test_bash_syntax.py | 8 +- pym/portage/tests/repoman/test_simple.py | 26 +- pym/portage/tests/resolver/ResolverPlayground.py | 52 +- pym/portage/tests/resolver/test_backtracking.py | 31 - pym/portage/tests/resolver/test_depclean_order.py | 57 ++ pym/portage/tests/resolver/test_merge_order.py | 35 +- pym/portage/tests/resolver/test_or_choices.py | 79 +++ .../resolver/test_slot_conflict_mask_update.py | 41 ++ .../tests/resolver/test_slot_conflict_update.py | 98 +++ pym/portage/tests/update/test_move_ent.py | 6 +- pym/portage/tests/update/test_move_slot_ent.py | 6 +- pym/portage/tests/update/test_update_dbentry.py | 6 +- pym/portage/util/__init__.py | 206 +++--- pym/portage/util/_argparse.py | 42 ++ pym/portage/util/_async/ForkProcess.py | 6 +- pym/portage/util/_desktop_entry.py | 16 +- pym/portage/util/listdir.py | 122 ++-- pym/portage/util/movefile.py | 10 +- pym/repoman/checks.py | 1 + pym/repoman/utilities.py | 7 +- 149 files changed, 4709 insertions(+), 2542 deletions(-) diff --cc pym/_emerge/actions.py index b795f0e,4c53c25..f3874ec --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@@ -3582,26 -3615,33 +3615,41 @@@ def run_action(emerge_config) # it cancels all binary package options. for opt in ("--getbinpkg", "--getbinpkgonly", "--usepkg", "--usepkgonly"): - myopts.pop(opt, None) + emerge_config.opts.pop(opt, None) - adjust_configs(myopts, trees) - apply_priorities(settings) + adjust_configs(emerge_config.opts, emerge_config.trees) + apply_priorities(emerge_config.target_config.settings) + if 'force-multilib' in settings.features: + if settings.get("NO_AUTO_FLAG", "") is "": + writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1) + writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1) + writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1) + writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1) + return 1 + - if myaction == 'version': + for fmt in emerge_config.target_config.settings["PORTAGE_BINPKG_FORMAT"].split(): + if not fmt in portage.const.SUPPORTED_BINPKG_FORMATS: + if "--pkg-format" in emerge_config.opts: + problematic="--pkg-format" + else: + problematic="PORTAGE_BINPKG_FORMAT" + + writemsg_level(("emerge: %s is not set correctly. Format " + \ + "'%s' is not supported.\n") % (problematic, fmt), + level=logging.ERROR, noiselevel=-1) + return 1 + + if emerge_config.action == 'version': writemsg_stdout(getportageversion( - settings["PORTDIR"], None, - settings.profile_path, settings["CHOST"], - trees[settings['EROOT']]['vartree'].dbapi) + '\n', noiselevel=-1) + emerge_config.target_config.settings["PORTDIR"], + None, + emerge_config.target_config.settings.profile_path, + emerge_config.target_config.settings["CHOST"], + emerge_config.target_config.trees['vartree'].dbapi) + '\n', + noiselevel=-1) return 0 - elif myaction == 'help': + elif emerge_config.action == 'help': emerge_help() return 0