From: "Thomas Sachau" <tommy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:multilib commit in: /
Date: Sun, 4 Aug 2013 11:19:17 +0000 (UTC) [thread overview]
Message-ID: <1375614867.ed2bdce054f8c05045da13241896e2ada5babb6d.tommy@gentoo> (raw)
commit: ed2bdce054f8c05045da13241896e2ada5babb6d
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 11:14:27 2013 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> 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
next reply other threads:[~2013-08-04 11:19 UTC|newest]
Thread overview: 192+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-04 11:19 Thomas Sachau [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 11:57 [gentoo-commits] proj/portage:multilib commit in: / Thomas Sachau
2022-03-21 11:43 Thomas Sachau
2022-03-21 11:34 Thomas Sachau
2022-03-21 11:33 Thomas Sachau
2022-03-21 11:27 Thomas Sachau
2022-03-21 11:26 Thomas Sachau
2022-03-21 10:01 Thomas Sachau
2021-10-30 9:44 Thomas Sachau
2021-10-30 9:44 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-07-25 11:43 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-04-03 8:28 Thomas Sachau
2021-01-23 9:52 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2020-10-30 10:29 Thomas Sachau
2020-08-23 12:22 Thomas Sachau
2020-07-05 17:57 Thomas Sachau
2019-12-26 11:56 Thomas Sachau
2019-03-17 11:35 Thomas Sachau
2019-03-09 9:56 Thomas Sachau
2018-09-01 11:03 Thomas Sachau
2018-05-23 12:23 Thomas Sachau
2018-04-14 12:16 Thomas Sachau
2018-03-03 15:18 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:43 Thomas Sachau
2018-01-07 10:38 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:33 Thomas Sachau
2018-01-07 10:30 Thomas Sachau
2018-01-07 10:09 Thomas Sachau
2018-01-07 9:50 Thomas Sachau
2018-01-07 9:39 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2016-02-28 12:37 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-10-04 11:38 Thomas Sachau
2015-05-05 11:29 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-12-12 20:23 Thomas Sachau
2014-06-02 20:00 Thomas Sachau
2013-09-15 20:54 Thomas Sachau
2013-09-15 11:39 Thomas Sachau
2013-09-15 11:06 Thomas Sachau
2013-09-10 16:53 Thomas Sachau
2013-08-25 19:50 Thomas Sachau
2013-08-18 20:55 Thomas Sachau
2013-08-04 11:19 Thomas Sachau
2013-05-31 12:16 Thomas Sachau
2013-05-20 10:41 Thomas Sachau
2013-05-10 8:01 Thomas Sachau
2013-04-14 13:20 Thomas Sachau
2013-04-03 11:51 Thomas Sachau
2013-03-28 19:31 Thomas Sachau
2013-03-23 16:24 Thomas Sachau
2013-03-08 17:46 Thomas Sachau
2013-03-03 13:44 Thomas Sachau
2013-02-16 18:47 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-26 17:19 Thomas Sachau
2013-01-12 11:21 Thomas Sachau
2012-12-16 10:49 Thomas Sachau
2012-12-14 20:16 Thomas Sachau
2012-12-14 20:14 Thomas Sachau
2012-12-09 10:54 Thomas Sachau
2012-12-07 22:24 Thomas Sachau
2012-11-30 16:44 Thomas Sachau
2012-10-29 12:23 Thomas Sachau
2012-10-22 8:57 Thomas Sachau
2012-10-14 9:35 Thomas Sachau
2012-10-06 11:34 Thomas Sachau
2012-09-29 12:51 Thomas Sachau
2012-09-24 20:38 Thomas Sachau
2012-09-22 15:33 Thomas Sachau
2012-09-22 15:23 Thomas Sachau
2012-09-17 17:07 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-09-08 12:55 Thomas Sachau
2012-07-08 10:03 Thomas Sachau
2012-07-01 12:01 Thomas Sachau
2012-06-10 12:42 Thomas Sachau
2012-06-03 12:33 Thomas Sachau
2012-05-28 10:19 Thomas Sachau
2012-05-17 10:00 Thomas Sachau
2012-05-12 7:57 Thomas Sachau
2012-05-11 20:38 Thomas Sachau
2012-04-24 21:26 Thomas Sachau
2012-04-06 11:50 Thomas Sachau
2012-04-04 12:42 Thomas Sachau
2012-04-01 22:00 Thomas Sachau
2012-03-30 18:55 Thomas Sachau
2012-03-24 10:51 Thomas Sachau
2012-03-23 14:42 Thomas Sachau
2012-03-21 18:50 Thomas Sachau
2012-03-18 15:29 Thomas Sachau
2012-03-06 18:21 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-25 12:04 Thomas Sachau
2012-02-23 19:08 Thomas Sachau
2012-02-18 15:52 Thomas Sachau
2012-02-06 19:38 Thomas Sachau
2011-12-28 13:33 Thomas Sachau
2011-12-24 14:16 Thomas Sachau
2011-12-16 16:30 Thomas Sachau
2011-12-07 21:31 Thomas Sachau
2011-11-26 14:03 Thomas Sachau
2011-11-19 14:25 Thomas Sachau
2011-11-18 23:27 Thomas Sachau
2011-11-11 22:52 Thomas Sachau
2011-10-31 19:53 Thomas Sachau
2011-10-24 18:54 Thomas Sachau
2011-10-23 11:05 Thomas Sachau
2011-10-23 11:05 Thomas Sachau
2011-10-21 13:57 Thomas Sachau
2011-10-12 16:28 Thomas Sachau
2011-10-09 10:33 Thomas Sachau
2011-10-08 8:34 Thomas Sachau
2011-10-07 12:41 Thomas Sachau
2011-10-01 13:56 Thomas Sachau
2011-10-01 13:56 Thomas Sachau
2011-09-11 14:33 Thomas Sachau
2011-09-09 13:03 Thomas Sachau
2011-08-16 12:20 Thomas Sachau
2011-08-05 12:29 Thomas Sachau
2011-08-01 16:53 Thomas Sachau
2011-07-28 17:07 Thomas Sachau
2011-07-21 19:18 Thomas Sachau
2011-07-15 13:24 Thomas Sachau
2011-07-05 17:34 Thomas Sachau
2011-06-16 16:54 Thomas Sachau
2011-06-07 15:44 Thomas Sachau
2011-05-28 13:14 Thomas Sachau
2011-05-26 17:55 Thomas Sachau
2011-05-22 9:42 Thomas Sachau
2011-05-14 9:59 Thomas Sachau
2011-05-07 18:38 Thomas Sachau
2011-04-16 10:17 Thomas Sachau
2011-04-16 10:17 Thomas Sachau
2011-03-28 17:24 Thomas Sachau
2011-03-19 19:39 Thomas Sachau
2011-03-17 17:58 Thomas Sachau
2011-03-03 19:53 Thomas Sachau
2011-02-25 13:45 Thomas Sachau
2011-02-16 20:15 Thomas Sachau
2011-02-10 18:12 Thomas Sachau
2011-02-08 18:12 Thomas Sachau
2011-02-06 13:10 Thomas Sachau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375614867.ed2bdce054f8c05045da13241896e2ada5babb6d.tommy@gentoo \
--to=tommy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox