aboriginal: sources/native-builds/gentoo-bootstrap/patches/portage-2.1.8.3.patch annotate

annotate sources/native-builds/gentoo-bootstrap/patches/portage-2.1.8.3.patch @ 1251:204238871b7c

Shuffle gentoo bootstrapping into a single directory (with files and patches subdirectories under that).

author	Rob Landley <rob@landley.net>
date	Fri, 24 Sep 2010 08:36:21 -0500
parents	sources/native-builds/gentoo-stage1-patches/portage-2.1.8.3.patch@25607cc50c8f
children

rev	line source
1112 25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1 Index: ChangeLog
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	2 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	3 --- a/ChangeLog (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	4 +++ b/ChangeLog (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	5 @@ -1,3 +1,178 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	6 +2010-03-10 00:31 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	7 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	8 + * [r15814] pym/_emerge/depgraph.py: Only try to merge portage asap
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	9 + when the new version is different. (trunk r15813)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	10 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	11 +2010-03-09 21:27 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	12 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	13 + * [r15812] pym/_emerge/Scheduler.py, pym/_emerge/depgraph.py: Only
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	14 + create implicit libc deps when the version changes. (trunk
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	15 + r15810)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	16 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	17 +2010-03-09 21:25 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	18 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	19 + * [r15811] pym/_emerge/Scheduler.py, pym/_emerge/depgraph.py:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	20 + Disable implicit libc deps for ROOT != "/" since it's probably
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	21 + not needed. (trunk r15809)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	22 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	23 +2010-03-09 20:21 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	24 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	25 + * [r15808] pym/_emerge/depgraph.py: Merge libc asap for all roots
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	26 + instead of just ROOT="/". (trunk r15804)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	27 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	28 +2010-03-09 20:21 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	29 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	30 + * [r15807] pym/_emerge/sync/old_tree_timestamp.py: Add periods.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	31 + (trunk r15803)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	32 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	33 +2010-03-09 20:20 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	34 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	35 + * [r15806] pym/_emerge/sync/old_tree_timestamp.py: Use ewarn output
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	36 + style to add some color. (trunk r15802)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	37 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	38 +2010-03-09 20:20 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	39 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	40 + * [r15805] man/portage.5: * Remove outdated profiles.desc sentence
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	41 + about "1 profile allowed per stable/dev/KEYWORD". Thanks to
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	42 + Torsten Veller <tove@g.o> for reporting.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	43 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	44 + * Add 'exp' to valid profiles.desc status values, and update the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	45 + example. (trunk r15795)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	46 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	47 +2010-03-09 08:11 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	48 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	49 + * [r15794] pym/portage/mail.py: Import 'email' and 'smtlib' locally
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	50 + since python ebuilds remove the 'email' module when built with
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	51 + USE=build. (trunk r15793)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	52 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	53 +2010-03-09 05:04 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	54 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	55 + * [r15792] pym/_emerge/Scheduler.py: Add --debug output for the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	56 + scheduler digraph. (trunk r15790)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	57 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	58 +2010-03-09 05:04 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	59 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	60 + * [r15791] pym/_emerge/Scheduler.py: If _implicit_libc_deps() finds
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	61 + both a new-style virtual and an old-style PROVIDE virtual, use
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	62 + the new-style virtual. (trunk r15789)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	63 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	64 +2010-03-09 04:31 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	65 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	66 + * [r15788] pym/_emerge/actions.py: Add support for displaying
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	67 + profile listed in make.profile/parent when make.profile is not a
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	68 + symlink. The first parent with a path inside $PORTDIR is
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	69 + displayed. (trunk r15787)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	70 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	71 +2010-03-09 03:59 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	72 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	73 + * [r15786] pym/_emerge/Scheduler.py: Fix typo in parenthesis from
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	74 + previous commit. (trunk r15784)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	75 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	76 +2010-03-09 03:58 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	77 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	78 + * [r15785] pym/_emerge/Scheduler.py: Bug #303567 - Create implicit
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	79 + dependencies on libc, in order to ensure that libc is installed
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	80 + as early as possible. (trunk r15783)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	81 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	82 +2010-03-09 02:42 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	83 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	84 + * [r15782] pym/portage/dbapi/vartree.py,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	85 + pym/portage/proxy/lazyimport.py: When portage upgrades or
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	86 + downgrades itself, preload lazily referenced portage submodules
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	87 + into memory so that imports won't fail later. (trunk r15778)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	88 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	89 +2010-03-09 02:42 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	90 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	91 + * [r15781] man/emerge.1, pym/_emerge/help.py: Move --update from
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	92 + the actions to the options section. (trunk r15777)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	93 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	94 +2010-03-09 02:42 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	95 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	96 + * [r15780] man/emerge.1, pym/_emerge/help.py: Clean up/sync docs
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	97 + for emerge --sync, and add a note about PORTAGE_SYNC_STALE.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	98 + (trunk r15776)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	99 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	100 +2010-03-09 02:42 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	101 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	102 + * [r15779] man/emerge.1: Escape hyphens. (trunk r15775)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	103 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	104 +2010-03-08 09:40 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	105 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	106 + * [r15772] pym/_emerge/sync/__init__.py: Add copyright header.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	107 + (trunk r15771)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	108 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	109 +2010-03-08 09:10 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	110 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	111 + * [r15770] pym/_emerge/actions.py: Disable PORTAGE_SYNC_STALE
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	112 + warnings when --usepkgonly is enabled. (trunk r15769)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	113 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	114 +2010-03-08 09:05 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	115 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	116 + * [r15768] pym/portage/package/ebuild/config.py: Exclude
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	117 + PORTAGE_SYNC_STALE from the ebuild environment. (trunk r15767)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	118 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	119 +2010-03-08 08:57 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	120 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	121 + * [r15766] pym/_emerge/depgraph.py: Bug #307409 - Force --verbose
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	122 + mode when displaying circular deps. (trunk r15765)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	123 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	124 +2010-03-08 08:47 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	125 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	126 + * [r15764] pym/portage/mail.py: Bug #291331 - Force ascii encoding
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	127 + in send_mail() in order to avoid UnicodeEncodeError from
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	128 + smtplib.sendmail with python3. (trunk r15759)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	129 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	130 +2010-03-08 08:47 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	131 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	132 + * [r15763] pym/_emerge/sync/old_tree_timestamp.py: Show --sync in
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	133 + messages, to help avoid confusion. (trunk r15758)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	134 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	135 +2010-03-08 08:47 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	136 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	137 + * [r15762] man/make.conf.5: Note that PORTAGE_SYNC_STALE=0 will
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	138 + disable warnings. (trunk r15757)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	139 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	140 +2010-03-08 08:47 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	141 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	142 + * [r15761] cnf/make.globals, man/make.conf.5,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	143 + pym/_emerge/actions.py, pym/_emerge/sync: Produce a warning
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	144 + message if the timestamp of the portage tree is more than 30 days
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	145 + old, and make it adjustable via the PORTAGE_SYNC_STALE variable.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	146 + Thanks to Ned Ludd <solar@g.o> for the most of this code. (trunk
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	147 + r15756)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	148 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	149 +2010-03-08 08:46 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	150 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	151 + * [r15760] pym/portage/package/ebuild/doebuild.py: Bug #308415 -
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	152 + Fix broken uri parameter passed to fetch () for some cases when
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	153 + using ebuild(1). (trunk r15755)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	154 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	155 +2010-03-04 11:23 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	156 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	157 + * [r15749] pym/portage/package/ebuild/getmaskingstatus.py: Bug
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	158 + #307723 - Define basestring for python3. (trunk r15745)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	159 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	160 +2010-03-04 11:23 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	161 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	162 + * [r15748] pym/portage/package/ebuild/doebuild.py,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	163 + pym/portage/package/ebuild/fetch.py: Fix imports
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	164 + doebuild_environment and prepare_build_dirs imports to import
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	165 + from the real location instead of importing proxies. (trunk
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	166 + r15744)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	167 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	168 +2010-03-04 11:22 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	169 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	170 + * [r15747] pym/portage/package/ebuild/fetch.py: Bug #307707 - Fix
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	171 + fetch() to use the correct spawn function when calling nofetch.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	172 + (trunk r15743)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	173 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	174 +2010-03-04 11:22 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	175 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	176 + * [r15746] man/color.map.5, pym/_emerge/depgraph.py,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	177 + pym/portage/output.py: Add new colors for binary packages in the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	178 + merge list. Thanks to Sebastian Luther (few) for this patch.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	179 + (trunk r15739)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	180 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	181 2010-03-03 06:27 zmedico
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	182
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	183 * [r15731] NEWS: Add news about splitting the top-level
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	184 Index: cnf/make.globals
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	185 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	186 --- a/cnf/make.globals (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	187 +++ b/cnf/make.globals (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	188 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	189 # Copyright 1999-2006 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	190 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	191 -# $Id: make.globals 15254 2010-01-29 18:49:10Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	192 +# $Id: make.globals 15761 2010-03-08 08:47:02Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	193 # System-wide defaults for the Portage system
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	194
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	195 # *****************************
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	196 @@ -80,6 +80,10 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	197
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	198 PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	199
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	200 +# The number of days after the last `emerge --sync` that a warning
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	201 +# message should be produced.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	202 +PORTAGE_SYNC_STALE="30"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	203 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	204 # Minimal CONFIG_PROTECT
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	205 CONFIG_PROTECT="/etc"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	206 CONFIG_PROTECT_MASK="/etc/env.d"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	207 Index: man/color.map.5
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	208 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	209 --- a/man/color.map.5 (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	210 +++ b/man/color.map.5 (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	211 @@ -50,6 +50,15 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	212 \fBPKG_MERGE_WORLD\fR = \fI"green"\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	213 Defines color used for world packages planned to be merged.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	214 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	215 +\fBPKG_BINARY_MERGE\fR = \fI"darkgreen"\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	216 +Defines color used for packages planned to be merged using a binary package.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	217 +.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	218 +\fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"darkgreen"\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	219 +Defines color used for system packages planned to be merged using a binary package.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	220 +.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	221 +\fBPKG_BINARY_MERGE_WORLD\fR = \fI"green"\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	222 +Defines color used for world packages planned to be merged using a binary package.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	223 +.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	224 \fBPKG_NOMERGE\fR = \fI"darkblue"\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	225 Defines color used for packages not planned to be merged.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	226 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	227 Index: man/emerge.1
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	228 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	229 --- a/man/emerge.1 (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	230 +++ b/man/emerge.1 (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	231 @@ -195,7 +195,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	232 name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	233 package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	234 any package that contains the word "office". If you want to include the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	235 -category into the search string, prepend an @: \fBemerge --search
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	236 +category into the search string, prepend an @: \fBemerge \-\-search
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	237 "%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	238 use the \fB\-\-searchdesc\fR action.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	239 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	240 @@ -205,11 +205,26 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	241 matched as regular expressions.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	242 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	243 .BR \-\-sync
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	244 -Initiates a portage tree update with one of the rsync.gentoo.org
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	245 -mirrors. \fBNote that any changes you have made to the portage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	246 -tree will be erased\fR. Except for special circumstances,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	247 -this uses \fBrsync\fR to do the update. See \fBmake.conf\fR(5)'s
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	248 -description of PORTDIR_OVERLAY for a method to avoid deletions.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	249 +This updates the portage tree that is located in the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	250 +directory that the PORTDIR variable refers to (default
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	251 +location is /usr/portage). The SYNC variable specifies
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	252 +the remote URI from which files will be synchronized.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	253 +The \fBPORTAGE_SYNC_STALE\fR variable configures
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	254 +warnings that are shown when emerge \-\-sync has not
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	255 +been executed recently.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	256 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	257 +\fBWARNING:\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	258 +The emerge \-\-sync action will modify and/or delete
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	259 +files located inside the directory that the PORTDIR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	260 +variable refers to (default location is /usr/portage).
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	261 +For more information, see the PORTDIR documentation in
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	262 +the make.conf(5) man page.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	263 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	264 +\fBNOTE:\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	265 +The \fBemerge\-webrsync\fR program will download the entire
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	266 +portage tree as a tarball, which is much faster than emerge
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	267 +\-\-sync for first time syncs.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	268 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	269 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	270 .BR "\-\-unmerge " (\fB\-C\fR)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	271 \fBWARNING: This action can remove important packages!\fR Removes
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	272 @@ -219,13 +234,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	273 \fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	274 use \fB\-\-depclean\fR or \fB\-\-prune\fR.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	275 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	276 -.BR "\-\-update " (\fB\-u\fR)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	277 -Updates packages to the best version available, which may not always be the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	278 -highest version number due to masking for testing and development.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	279 -Package atoms
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	280 -specified on the command line are greedy, meaning that unspecific atoms may
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	281 -match multiple installed versions of slotted packages.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	282 -.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	283 .BR "\-\-version " (\fB\-V\fR)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	284 Displays the version number of \fBemerge\fR.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	285 .SH "OPTIONS"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	286 @@ -536,6 +544,13 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	287 constraint is removed, hopefully leading to a more
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	288 readable dependency tree.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	289 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	290 +.BR "\-\-update " (\fB\-u\fR)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	291 +Updates packages to the best version available, which may
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	292 +not always be the highest version number due to masking
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	293 +for testing and development. Package atoms specified on
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	294 +the command line are greedy, meaning that unspecific
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	295 +atoms may match multiple versions of slotted packages.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	296 +.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	297 .BR "\-\-use\-ebuild\-visibility[=n]"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	298 Use unbuilt ebuild metadata for visibility
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	299 checks on built packages.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	300 Index: man/make.conf.5
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	301 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	302 --- a/man/make.conf.5 (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	303 +++ b/man/make.conf.5 (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	304 @@ -639,6 +639,12 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	305 .br
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	306 Defaults to 3.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	307 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	308 +\fBPORTAGE_SYNC_STALE\fR = \fI[NUMBER]\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	309 +Defines the number of days after the last `emerge \-\-sync` that a warning
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	310 +message should be produced. A value of 0 will disable warnings.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	311 +.br
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	312 +Defaults to 30.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	313 +.TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	314 \fBPORTAGE_TMPDIR\fR = \fI[path]\fR
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	315 Defines the location of the temporary build directories.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	316 .br
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	317 Index: man/portage.5
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	318 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	319 --- a/man/portage.5 (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	320 +++ b/man/portage.5 (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	321 @@ -751,23 +751,22 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	322 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	323 .BR profiles.desc
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	324 List all the current stable and development profiles. If a profile is listed
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	325 -here, then it will be checked by repoman. At the moment, only 1 profile is
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	326 -allowed per stable/dev/KEYWORD; the last one found is the last one used.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	327 -
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	328 +here, then it will be checked by repoman.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	329 .I Format:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	330 .nf
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	331 \- comments begin with # (no inline comments)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	332 \- one profile list per line in format: arch dir status
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	333 \- arch must be listed in arch.list
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	334 \- dir is relative to profiles.desc
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	335 -\- status must be 'stable' or 'dev'
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	336 +\- status must be 'stable', 'dev', or 'exp'
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	337 .fi
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	338
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	339 .I Example:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	340 .nf
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	341 -alpha default-linux/alpha/2004.3 stable
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	342 -m68k default-linux/m68k dev
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	343 -x86 default-linux/x86/2004.3 stable
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	344 +alpha default/linux/alpha/10.0 stable
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	345 +m68k default/linux/m68k/10.0 dev
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	346 +x86 default/linux/x86/10.0 stable
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	347 +x86-linux prefix/linux/x86 exp
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	348 .fi
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	349 .TP
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	350 .BR repo_name
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	351 Index: pym/_emerge/actions.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	352 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	353 --- a/pym/_emerge/actions.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	354 +++ b/pym/_emerge/actions.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	355 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	356 # Copyright 1999-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	357 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	358 -# $Id: actions.py 15687 2010-03-02 21:07:53Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	359 +# $Id: actions.py 15788 2010-03-09 04:31:13Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	360
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	361 from __future__ import print_function
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	362
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	363 @@ -53,6 +53,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	364 from _emerge.search import search
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	365 from _emerge.SetArg import SetArg
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	366 from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	367 +from _emerge.sync.old_tree_timestamp import old_tree_timestamp_warn
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	368 from _emerge.unmerge import unmerge
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	369 from _emerge.UnmergeDepPriority import UnmergeDepPriority
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	370 from _emerge.UseFlagDisplay import UseFlagDisplay
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	371 @@ -64,6 +65,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	372 def action_build(settings, trees, mtimedb,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	373 myopts, myaction, myfiles, spinner):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	374
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	375 + if '--usepkgonly' not in myopts:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	376 + old_tree_timestamp_warn(settings['PORTDIR'], settings)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	377 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	378 # validate the state of the resume data
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	379 # so that we can make assumptions later.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	380 for k in ("resume", "resume_backup"):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	381 @@ -2249,19 +2253,38 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	382 writemsg_level("".join("%s\n" % l for l in msg),
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	383 level=logging.ERROR, noiselevel=-1)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	384
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	385 +def relative_profile_path(portdir, abs_profile):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	386 + realpath = os.path.realpath(abs_profile)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	387 + basepath = os.path.realpath(os.path.join(portdir, "profiles"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	388 + if realpath.startswith(basepath):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	389 + profilever = realpath[1 + len(basepath):]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	390 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	391 + profilever = None
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	392 + return profilever
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	393 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	394 def getportageversion(portdir, target_root, profile, chost, vardb):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	395 - profilever = "unavailable"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	396 + profilever = None
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	397 if profile:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	398 - realpath = os.path.realpath(profile)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	399 - basepath = os.path.realpath(os.path.join(portdir, "profiles"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	400 - if realpath.startswith(basepath):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	401 - profilever = realpath[1 + len(basepath):]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	402 - else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	403 + profilever = relative_profile_path(portdir, profile)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	404 + if profilever is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	405 try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	406 - profilever = "!" + os.readlink(profile)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	407 - except (OSError):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	408 + for parent in portage.grabfile(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	409 + os.path.join(profile, 'parent')):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	410 + profilever = relative_profile_path(portdir,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	411 + os.path.join(profile, parent))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	412 + if profilever is not None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	413 + break
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	414 + except portage.exception.PortageException:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	415 pass
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	416 - del realpath, basepath
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	417 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	418 + if profilever is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	419 + try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	420 + profilever = "!" + os.readlink(profile)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	421 + except (OSError):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	422 + pass
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	423 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	424 + if profilever is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	425 + profilever = "unavailable"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	426
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	427 libcver=[]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	428 libclist = vardb.match("virtual/libc")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	429 Index: pym/_emerge/depgraph.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	430 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	431 --- a/pym/_emerge/depgraph.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	432 +++ b/pym/_emerge/depgraph.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	433 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	434 # Copyright 1999-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	435 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	436 -# $Id: depgraph.py 15711 2010-03-02 21:14:20Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	437 +# $Id: depgraph.py 15814 2010-03-10 00:31:43Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	438
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	439 from __future__ import print_function
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	440
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	441 @@ -3341,7 +3341,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	442 if replacement_portage == running_portage:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	443 replacement_portage = None
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	444
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	445 - if replacement_portage is not None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	446 + if replacement_portage is not None and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	447 + (running_portage is None or \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	448 + (running_portage.cpv != replacement_portage.cpv)):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	449 # update from running_portage to replacement_portage asap
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	450 asap_nodes.append(replacement_portage)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	451
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	452 @@ -3363,12 +3365,16 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	453
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	454 # Merge libc asap, in order to account for implicit
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	455 # dependencies. See bug #303567.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	456 - libc_pkg = self._dynamic_config.mydbapi[running_root].match_pkgs(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	457 - portage.const.LIBC_PACKAGE_ATOM)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	458 - if libc_pkg:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	459 - libc_pkg = libc_pkg[0]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	460 - if libc_pkg.operation == 'merge':
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	461 - asap_nodes.append(libc_pkg)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	462 + for root in (running_root,):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	463 + libc_pkg = self._dynamic_config.mydbapi[root].match_pkgs(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	464 + portage.const.LIBC_PACKAGE_ATOM)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	465 + if libc_pkg:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	466 + libc_pkg = libc_pkg[0]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	467 + if libc_pkg.operation == 'merge':
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	468 + # Only add a dep when the version changes.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	469 + if not libc_pkg.root_config.trees[
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	470 + 'vartree'].dbapi.cpv_exists(libc_pkg.cpv):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	471 + asap_nodes.append(libc_pkg)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	472
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	473 def gather_deps(ignore_priority, mergeable_nodes,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	474 selected_nodes, node):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	475 @@ -3904,7 +3910,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	476 tempgraph.remove(node)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	477 display_order.reverse()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	478 self._frozen_config.myopts.pop("--quiet", None)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	479 - self._frozen_config.myopts.pop("--verbose", None)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	480 + self._frozen_config.myopts["--verbose"] = True
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	481 self._frozen_config.myopts["--tree"] = True
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	482 portage.writemsg("\n\n", noiselevel=-1)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	483 self.display(display_order)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	484 @@ -4500,12 +4506,20 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	485
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	486 def pkgprint(pkg_str):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	487 if pkg_merge:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	488 - if pkg_system:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	489 - return colorize("PKG_MERGE_SYSTEM", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	490 - elif pkg_world:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	491 - return colorize("PKG_MERGE_WORLD", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	492 + if built:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	493 + if pkg_system:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	494 + return colorize("PKG_BINARY_MERGE_SYSTEM", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	495 + elif pkg_world:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	496 + return colorize("PKG_BINARY_MERGE_WORLD", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	497 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	498 + return colorize("PKG_BINARY_MERGE", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	499 else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	500 - return colorize("PKG_MERGE", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	501 + if pkg_system:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	502 + return colorize("PKG_MERGE_SYSTEM", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	503 + elif pkg_world:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	504 + return colorize("PKG_MERGE_WORLD", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	505 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	506 + return colorize("PKG_MERGE", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	507 elif pkg_status == "uninstall":
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	508 return colorize("PKG_UNINSTALL", pkg_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	509 else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	510 Index: pym/_emerge/help.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	511 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	512 --- a/pym/_emerge/help.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	513 +++ b/pym/_emerge/help.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	514 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	515 # Copyright 1999-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	516 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	517 -# $Id: help.py 15687 2010-03-02 21:07:53Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	518 +# $Id: help.py 15781 2010-03-09 02:42:23Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	519
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	520 from __future__ import print_function
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	521
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	522 @@ -195,18 +195,31 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	523 print(" emerge -S 'perl.*module'")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	524 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	525 print(" "+green("--sync"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	526 - print(" Tells emerge to update the Portage tree as specified in")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	527 - print(" The SYNC variable found in /etc/make.conf. By default, SYNC instructs")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	528 - print(" emerge to perform an rsync-style update with rsync.gentoo.org.")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	529 + desc = "This updates the portage tree that is located in the " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	530 + "directory that the PORTDIR variable refers to (default " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	531 + "location is /usr/portage). The SYNC variable specifies " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	532 + "the remote URI from which files will be synchronized. " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	533 + "The PORTAGE_SYNC_STALE variable configures " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	534 + "warnings that are shown when emerge --sync has not " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	535 + "been executed recently."
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	536 + for line in wrap(desc, desc_width):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	537 + print(desc_indent + line)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	538 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	539 - print(" 'emerge-webrsync' exists as a helper app to emerge --sync, providing a")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	540 - print(" method to receive the entire portage tree as a tarball that can be")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	541 - print(" extracted and used. First time syncs would benefit greatly from this.")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	542 + print(desc_indent + turquoise("WARNING:"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	543 + desc = "The emerge --sync action will modify and/or delete " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	544 + "files located inside the directory that the PORTDIR " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	545 + "variable refers to (default location is /usr/portage). " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	546 + "For more information, see the PORTDIR documentation in " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	547 + "the make.conf(5) man page."
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	548 + for line in wrap(desc, desc_width):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	549 + print(desc_indent + line)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	550 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	551 - print(" "+turquoise("WARNING:"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	552 - print(" If using our rsync server, emerge will clean out all files that do not")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	553 - print(" exist on it, including ones that you may have created. The exceptions")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	554 - print(" to this are the distfiles, local and packages directories.")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	555 + print(desc_indent + green("NOTE:"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	556 + desc = "The emerge-webrsync program will download the entire " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	557 + "portage tree as a tarball, which is much faster than emerge " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	558 + "--sync for first time syncs."
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	559 + for line in wrap(desc, desc_width):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	560 + print(desc_indent + line)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	561 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	562 print(" "+green("--unmerge")+" ("+green("-C")+" short option)")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	563 print(" "+turquoise("WARNING: This action can remove important packages!"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	564 @@ -216,13 +229,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	565 print(" ebuilds. For a dependency aware version of --unmerge, use")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	566 print(" --depclean or --prune.")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	567 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	568 - print(" "+green("--update")+" ("+green("-u")+" short option)")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	569 - print(" Updates packages to the best version available, which may not")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	570 - print(" always be the highest version number due to masking for testing")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	571 - print(" and development. Package atoms specified on the command")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	572 - print(" line are greedy, meaning that unspecific atoms may match multiple")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	573 - print(" installed versions of slotted packages.")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	574 - print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	575 print(" "+green("--version")+" ("+green("-V")+" short option)")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	576 print(" Displays the currently installed version of portage along with")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	577 print(" other information useful for quick reference on a system. See")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	578 @@ -591,6 +597,15 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	579 for line in wrap(desc, desc_width):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	580 print(desc_indent + line)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	581 print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	582 + print(" "+green("--update")+" ("+green("-u")+" short option)")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	583 + desc = "Updates packages to the best version available, which may " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	584 + "not always be the highest version number due to masking " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	585 + "for testing and development. Package atoms specified on " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	586 + "the command line are greedy, meaning that unspecific " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	587 + "atoms may match multiple versions of slotted packages."
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	588 + for line in wrap(desc, desc_width):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	589 + print(desc_indent + line)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	590 + print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	591 print(" " + green("--use-ebuild-visibility") + "[=%s]" % turquoise("n"))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	592 desc = "Use unbuilt ebuild metadata for visibility " + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	593 "checks on built packages."
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	594 Index: pym/_emerge/Scheduler.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	595 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	596 --- a/pym/_emerge/Scheduler.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	597 +++ b/pym/_emerge/Scheduler.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	598 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	599 # Copyright 1999-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	600 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	601 -# $Id: Scheduler.py 15708 2010-03-02 21:13:39Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	602 +# $Id: Scheduler.py 15812 2010-03-09 21:27:32Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	603
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	604 from __future__ import print_function
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	605
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	606 @@ -18,6 +18,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	607 from portage import _unicode_decode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	608 from portage import _unicode_encode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	609 from portage.cache.mappings import slot_dict_class
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	610 +from portage.const import LIBC_PACKAGE_ATOM
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	611 from portage.elog.messages import eerror
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	612 from portage.output import colorize, create_color_func, darkgreen, red
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	613 bad = create_color_func("BAD")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	614 @@ -351,6 +352,11 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	615 self._find_system_deps()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	616 self._prune_digraph()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	617 self._prevent_builddir_collisions()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	618 + self._implicit_libc_deps()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	619 + if '--debug' in self.myopts:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	620 + writemsg("\nscheduler digraph:\n\n", noiselevel=-1)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	621 + self._digraph.debug_print()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	622 + writemsg("\n", noiselevel=-1)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	623
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	624 def _find_system_deps(self):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	625 """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	626 @@ -412,6 +418,69 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	627 priority=DepPriority(buildtime=True))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	628 cpv_map[pkg.cpv].append(pkg)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	629
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	630 + def _implicit_libc_deps(self):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	631 + """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	632 + Create implicit dependencies on libc, in order to ensure that libc
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	633 + is installed as early as possible (see bug #303567). If the merge
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	634 + list contains both a new-style virtual and an old-style PROVIDE
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	635 + virtual, the new-style virtual is used.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	636 + """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	637 + implicit_libc_roots = set([self._running_root.root])
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	638 + libc_set = InternalPackageSet([LIBC_PACKAGE_ATOM])
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	639 + norm_libc_pkgs = {}
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	640 + virt_libc_pkgs = {}
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	641 + for pkg in self._mergelist:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	642 + if not isinstance(pkg, Package):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	643 + # a satisfied blocker
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	644 + continue
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	645 + if pkg.installed:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	646 + continue
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	647 + if pkg.root in implicit_libc_roots and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	648 + pkg.operation == 'merge':
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	649 + if libc_set.findAtomForPackage(pkg):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	650 + if pkg.category == 'virtual':
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	651 + d = virt_libc_pkgs
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	652 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	653 + d = norm_libc_pkgs
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	654 + if pkg.root in d:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	655 + raise AssertionError(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	656 + "found 2 libc matches: %s and %s" % \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	657 + (d[pkg.root], pkg))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	658 + d[pkg.root] = pkg
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	659 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	660 + # Prefer new-style virtuals over old-style PROVIDE virtuals.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	661 + libc_pkg_map = norm_libc_pkgs.copy()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	662 + libc_pkg_map.update(virt_libc_pkgs)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	663 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	664 + # Only add a dep when the version changes.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	665 + for libc_pkg in list(libc_pkg_map.values()):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	666 + if libc_pkg.root_config.trees['vartree'].dbapi.cpv_exists(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	667 + libc_pkg.cpv):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	668 + del libc_pkg_map[pkg.root]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	669 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	670 + if not libc_pkg_map:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	671 + return
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	672 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	673 + libc_pkgs = set(libc_pkg_map.values())
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	674 + earlier_libc_pkgs = set()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	675 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	676 + for pkg in self._mergelist:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	677 + if not isinstance(pkg, Package):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	678 + # a satisfied blocker
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	679 + continue
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	680 + if pkg.installed:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	681 + continue
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	682 + if pkg.root in implicit_libc_roots and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	683 + pkg.operation == 'merge':
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	684 + if pkg in libc_pkgs:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	685 + earlier_libc_pkgs.add(pkg)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	686 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	687 + my_libc = libc_pkg_map.get(pkg.root)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	688 + if my_libc is not None and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	689 + my_libc in earlier_libc_pkgs:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	690 + self._digraph.add(my_libc, pkg,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	691 + priority=DepPriority(buildtime=True))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	692 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	693 class _pkg_failure(portage.exception.PortageException):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	694 """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	695 An instance of this class is raised by unmerge() when
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	696 Index: pym/_emerge/sync/__init__.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	697 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	698 --- a/pym/_emerge/sync/__init__.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	699 +++ b/pym/_emerge/sync/__init__.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	700 @@ -0,0 +1,3 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	701 +# Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	702 +# Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	703 +# $Id: __init__.py 15772 2010-03-08 09:40:46Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	704 Index: pym/_emerge/sync/old_tree_timestamp.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	705 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	706 --- a/pym/_emerge/sync/old_tree_timestamp.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	707 +++ b/pym/_emerge/sync/old_tree_timestamp.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	708 @@ -0,0 +1,99 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	709 +# Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	710 +# Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	711 +# $Id: old_tree_timestamp.py 15807 2010-03-09 20:21:05Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	712 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	713 +import locale
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	714 +import logging
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	715 +import time
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	716 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	717 +from portage import os
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	718 +from portage.exception import PortageException
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	719 +from portage.localization import _
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	720 +from portage.output import EOutput
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	721 +from portage.util import grabfile, writemsg_level
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	722 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	723 +def have_english_locale():
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	724 + lang, enc = locale.getdefaultlocale()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	725 + if lang is not None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	726 + lang = lang.lower()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	727 + lang = lang.split('_', 1)[0]
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	728 + return lang is None or lang in ('c', 'en')
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	729 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	730 +def whenago(seconds):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	731 + sec = int(seconds)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	732 + mins = 0
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	733 + days = 0
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	734 + hrs = 0
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	735 + years = 0
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	736 + out = []
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	737 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	738 + if sec > 60:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	739 + mins = sec / 60
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	740 + sec = sec % 60
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	741 + if mins > 60:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	742 + hrs = mins / 60
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	743 + mins = mins % 60
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	744 + if hrs > 24:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	745 + days = hrs / 24
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	746 + hrs = hrs % 24
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	747 + if days > 365:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	748 + years = days / 365
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	749 + days = days % 365
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	750 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	751 + if years:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	752 + out.append(str(years)+"y ")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	753 + if days:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	754 + out.append(str(days)+"d ")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	755 + if hrs:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	756 + out.append(str(hrs)+"h ")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	757 + if mins:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	758 + out.append(str(mins)+"m ")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	759 + if sec:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	760 + out.append(str(sec)+"s ")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	761 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	762 + return "".join(out).strip()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	763 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	764 +def old_tree_timestamp_warn(portdir, settings):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	765 + unixtime = time.time()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	766 + default_warnsync = 30
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	767 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	768 + timestamp_file = os.path.join(portdir, "metadata/timestamp.x")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	769 + try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	770 + lastsync = grabfile(timestamp_file)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	771 + except PortageException:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	772 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	773 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	774 + if not lastsync:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	775 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	776 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	777 + lastsync = lastsync[0].split()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	778 + if not lastsync:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	779 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	780 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	781 + try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	782 + lastsync = int(lastsync[0])
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	783 + except ValueError:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	784 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	785 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	786 + var_name = 'PORTAGE_SYNC_STALE'
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	787 + try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	788 + warnsync = float(settings.get(var_name, default_warnsync))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	789 + except ValueError:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	790 + writemsg_level("!!! %s contains non-numeric value: %s\n" % \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	791 + (var_name, settings[var_name]),
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	792 + level=logging.ERROR, noiselevel=-1)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	793 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	794 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	795 + if warnsync <= 0:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	796 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	797 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	798 + if (unixtime - 86400 * warnsync) > lastsync:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	799 + out = EOutput()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	800 + if have_english_locale():
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	801 + out.ewarn("Last emerge --sync was %s ago." % \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	802 + whenago(unixtime - lastsync))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	803 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	804 + out.ewarn(_("Last emerge --sync was %s.") % \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	805 + time.strftime('%c', time.localtime(lastsync)))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	806 + return True
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	807 + return False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	808 Index: pym/portage/dbapi/vartree.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	809 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	810 --- a/pym/portage/dbapi/vartree.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	811 +++ b/pym/portage/dbapi/vartree.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	812 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	813 # Copyright 1998-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	814 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	815 -# $Id: vartree.py 15727 2010-03-03 01:27:27Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	816 +# $Id: vartree.py 15782 2010-03-09 02:42:40Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	817
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	818 __all__ = [
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	819 "vardbapi", "vartree", "dblink"] + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	820 @@ -3181,6 +3181,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	821 if self.myroot == "/" and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	822 match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]) and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	823 not self.vartree.dbapi.cpv_exists(self.mycpv):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	824 + # Load lazily referenced portage submodules into memory,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	825 + # so imports won't fail during portage upgrade/downgrade.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	826 + portage.proxy.lazyimport._preload_portage_submodules()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	827 settings = self.settings
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	828 base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	829 from tempfile import mkdtemp
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	830 Index: pym/portage/mail.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	831 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	832 --- a/pym/portage/mail.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	833 +++ b/pym/portage/mail.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	834 @@ -1,36 +1,43 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	835 # portage.py -- core Portage functionality
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	836 # Copyright 1998-2004 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	837 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	838 -# $Id: mail.py 14860 2009-11-21 04:04:37Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	839 +# $Id: mail.py 15794 2010-03-09 08:11:46Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	840 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	841 +# Since python ebuilds remove the 'email' module when USE=build
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	842 +# is enabled, use a local import so that
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	843 +# portage.proxy.lazyimport._preload_portage_submodules()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	844 +# can load this module even though the 'email' module is missing.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	845 +# The elog mail modules won't work, but at least an ImportError
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	846 +# won't cause portage to crash during stage builds. Since the
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	847 +# 'smtlib' module imports the 'email' module, that's imported
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	848 +# locally as well.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	849
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	850 -from email.mime.text import MIMEText
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	851 -from email.mime.multipart import MIMEMultipart as MultipartMessage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	852 -from email.mime.base import MIMEBase as BaseMessage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	853 -from email.header import Header
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	854 -import smtplib
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	855 import socket
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	856 import sys
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	857 import time
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	858
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	859 from portage import os
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	860 from portage import _encodings
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	861 -from portage import _unicode_encode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	862 +from portage import _unicode_decode, _unicode_encode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	863 from portage.localization import _
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	864 import portage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	865
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	866 if sys.hexversion >= 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	867 basestring = str
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	868
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	869 -if sys.hexversion >= 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	870 - def TextMessage(_text):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	871 - mimetext = MIMEText(_text)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	872 +def TextMessage(_text):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	873 + from email.mime.text import MIMEText
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	874 + mimetext = MIMEText(_text)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	875 + if sys.hexversion >= 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	876 mimetext.set_charset("UTF-8")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	877 - return mimetext
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	878 -else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	879 - TextMessage = MIMEText
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	880 + return mimetext
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	881
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	882 def create_message(sender, recipient, subject, body, attachments=None):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	883
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	884 + from email.header import Header
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	885 + from email.mime.base import MIMEBase as BaseMessage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	886 + from email.mime.multipart import MIMEMultipart as MultipartMessage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	887 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	888 if sys.hexversion < 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	889 sender = _unicode_encode(sender,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	890 encoding=_encodings['content'], errors='strict')
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	891 @@ -69,6 +76,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	892 return mymessage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	893
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	894 def send_mail(mysettings, message):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	895 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	896 + import smtplib
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	897 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	898 mymailhost = "localhost"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	899 mymailport = 25
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	900 mymailuser = ""
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	901 @@ -135,7 +145,17 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	902 myconn = smtplib.SMTP(mymailhost, mymailport)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	903 if mymailuser != "" and mymailpasswd != "":
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	904 myconn.login(mymailuser, mymailpasswd)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	905 - myconn.sendmail(myfrom, myrecipient, message.as_string())
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	906 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	907 + message_str = message.as_string()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	908 + if sys.hexversion >= 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	909 + # Force ascii encoding in order to avoid UnicodeEncodeError
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	910 + # from smtplib.sendmail with python3 (bug #291331).
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	911 + message_str = _unicode_encode(message_str,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	912 + encoding='ascii', errors='backslashreplace')
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	913 + message_str = _unicode_decode(message_str,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	914 + encoding='ascii', errors='replace')
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	915 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	916 + myconn.sendmail(myfrom, myrecipient, message_str)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	917 myconn.quit()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	918 except smtplib.SMTPException as e:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	919 raise portage.exception.PortageException(_("!!! An error occured while trying to send logmail:\n")+str(e))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	920 Index: pym/portage/output.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	921 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	922 --- a/pym/portage/output.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	923 +++ b/pym/portage/output.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	924 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	925 # Copyright 1998-2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	926 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	927 -# $Id: output.py 15245 2010-01-29 18:47:30Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	928 +# $Id: output.py 15746 2010-03-04 11:22:15Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	929
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	930 __docformat__ = "epytext"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	931
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	932 @@ -139,6 +139,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	933 _styles["PKG_MERGE"] = ( "darkgreen", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	934 _styles["PKG_MERGE_SYSTEM"] = ( "darkgreen", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	935 _styles["PKG_MERGE_WORLD"] = ( "green", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	936 +_styles["PKG_BINARY_MERGE"] = ( "darkgreen", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	937 +_styles["PKG_BINARY_MERGE_SYSTEM"] = ( "darkgreen", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	938 +_styles["PKG_BINARY_MERGE_WORLD"] = ( "green", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	939 _styles["PKG_UNINSTALL"] = ( "red", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	940 _styles["PKG_NOMERGE"] = ( "darkblue", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	941 _styles["PKG_NOMERGE_SYSTEM"] = ( "darkblue", )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	942 Index: pym/portage/package/ebuild/config.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	943 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	944 --- a/pym/portage/package/ebuild/config.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	945 +++ b/pym/portage/package/ebuild/config.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	946 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	947 # Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	948 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	949 -# $Id: config.py 15705 2010-03-02 21:11:02Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	950 +# $Id: config.py 15768 2010-03-08 09:05:13Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	951
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	952 __all__ = [
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	953 'autouse', 'best_from_dict', 'check_config_instance', 'config',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	954 @@ -274,7 +274,8 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	955 "PORTAGE_REPO_DUPLICATE_WARN",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	956 "PORTAGE_RO_DISTDIRS",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	957 "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	958 - "PORTAGE_RSYNC_RETRIES", "PORTAGE_USE", "PORT_LOGDIR",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	959 + "PORTAGE_RSYNC_RETRIES", "PORTAGE_SYNC_STALE",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	960 + "PORTAGE_USE", "PORT_LOGDIR",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	961 "QUICKPKG_DEFAULT_OPTS",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	962 "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	963 "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER",
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	964 Index: pym/portage/package/ebuild/doebuild.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	965 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	966 --- a/pym/portage/package/ebuild/doebuild.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	967 +++ b/pym/portage/package/ebuild/doebuild.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	968 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	969 # Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	970 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	971 -# $Id: doebuild.py 15713 2010-03-02 21:14:43Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	972 +# $Id: doebuild.py 15760 2010-03-08 08:46:53Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	973
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	974 __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild']
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	975
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	976 @@ -25,6 +25,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	977 'portage.package.ebuild.config:check_config_instance',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	978 'portage.package.ebuild.digestcheck:digestcheck',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	979 'portage.package.ebuild.digestgen:digestgen',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	980 + 'portage.package.ebuild.fetch:fetch',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	981 'portage.util.ExtractKernelVersion:ExtractKernelVersion'
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	982 )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	983
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	984 @@ -47,7 +48,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	985 from portage.localization import _
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	986 from portage.manifest import Manifest
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	987 from portage.output import style_to_ansi_code
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	988 -from portage.package.ebuild.fetch import fetch
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	989 from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	990 from portage.util import apply_recursive_permissions, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	991 apply_secpass_permissions, noiselimit, normalize_path, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	992 @@ -810,7 +810,8 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	993 mydo not in ("digest", "manifest") and "noauto" not in features)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	994 alist = mysettings.configdict["pkg"].get("A")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	995 aalist = mysettings.configdict["pkg"].get("AA")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	996 - if alist is None or aalist is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	997 + if alist is None or aalist is None or \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	998 + (not emerge_skip_distfiles and need_distfiles):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	999 # Make sure we get the correct tree in case there are overlays.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1000 mytree = os.path.realpath(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1001 os.path.dirname(os.path.dirname(mysettings["O"])))
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1002 @@ -827,25 +828,26 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1003 return 1
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1004 mysettings.configdict["pkg"]["A"] = " ".join(alist)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1005 mysettings.configdict["pkg"]["AA"] = " ".join(aalist)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1006 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1007 + if not emerge_skip_distfiles and need_distfiles:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1008 + if "mirror" in features or fetchall:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1009 + fetchme = aalist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1010 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1011 + fetchme = alist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1012 + if not fetch(fetchme, mysettings, listonly=listonly,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1013 + fetchonly=fetchonly):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1014 + return 1
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1015 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1016 else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1017 alist = set(alist.split())
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1018 aalist = set(aalist.split())
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1019 - if ("mirror" in features) or fetchall:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1020 - fetchme = aalist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1021 - checkme = aalist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1022 - else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1023 - fetchme = alist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1024 - checkme = alist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1025
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1026 if mydo == "fetch":
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1027 # Files are already checked inside fetch(),
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1028 # so do not check them again.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1029 checkme = []
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1030 -
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1031 - if not emerge_skip_distfiles and \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1032 - need_distfiles and not fetch(
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1033 - fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1034 - return 1
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1035 + else:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1036 + checkme = alist
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1037
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1038 if mydo == "fetch" and listonly:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1039 return 0
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1040 Index: pym/portage/package/ebuild/fetch.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1041 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1042 --- a/pym/portage/package/ebuild/fetch.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1043 +++ b/pym/portage/package/ebuild/fetch.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1044 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1045 # Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1046 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1047 -# $Id: fetch.py 15718 2010-03-02 21:37:48Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1048 +# $Id: fetch.py 15748 2010-03-04 11:23:00Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1049
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1050 from __future__ import print_function
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1051
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1052 @@ -20,18 +20,26 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1053 import portage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1054 portage.proxy.lazyimport.lazyimport(globals(),
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1055 'portage.package.ebuild.config:check_config_instance,config',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1056 + 'portage.package.ebuild.doebuild:doebuild_environment,' + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1057 + 'spawn@doebuild_spawn',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1058 + 'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1059 )
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1060
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1061 -from portage import doebuild_environment, OrderedDict, os, prepare_build_dirs, selinux, _encodings, _shell_quote, _unicode_encode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1062 +from portage import OrderedDict, os, selinux, _encodings, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1063 + _shell_quote, _unicode_encode
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1064 from portage.checksum import perform_md5, verify_all
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1065 -from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, EBUILD_SH_BINARY, GLOBAL_CONFIG_PATH
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1066 +from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1067 + EBUILD_SH_BINARY, GLOBAL_CONFIG_PATH
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1068 from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1069 -from portage.exception import FileNotFound, OperationNotPermitted, PermissionDenied, PortageException, TryAgain
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1070 +from portage.exception import FileNotFound, OperationNotPermitted, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1071 + PermissionDenied, PortageException, TryAgain
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1072 from portage.localization import _
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1073 from portage.locks import lockfile, unlockfile
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1074 from portage.manifest import Manifest
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1075 from portage.output import colorize, EOutput
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1076 -from portage.util import apply_recursive_permissions, apply_secpass_permissions, ensure_dirs, grabdict, shlex_split, varexpand, writemsg, writemsg_level, writemsg_stdout
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1077 +from portage.util import apply_recursive_permissions, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1078 + apply_secpass_permissions, ensure_dirs, grabdict, shlex_split, \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1079 + varexpand, writemsg, writemsg_level, writemsg_stdout
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1080 from portage.process import spawn
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1081
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1082 _userpriv_spawn_kwargs = (
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1083 @@ -1096,7 +1104,7 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1084 ebuild_phase = mysettings.get("EBUILD_PHASE")
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1085 try:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1086 mysettings["EBUILD_PHASE"] = "nofetch"
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1087 - spawn(_shell_quote(EBUILD_SH_BINARY) + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1088 + doebuild_spawn(_shell_quote(EBUILD_SH_BINARY) + \
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1089 " nofetch", mysettings, fd_pipes=fd_pipes)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1090 finally:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1091 if ebuild_phase is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1092 Index: pym/portage/package/ebuild/getmaskingstatus.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1093 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1094 --- a/pym/portage/package/ebuild/getmaskingstatus.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1095 +++ b/pym/portage/package/ebuild/getmaskingstatus.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1096 @@ -1,9 +1,11 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1097 # Copyright 2010 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1098 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1099 -# $Id: getmaskingstatus.py 15672 2010-03-02 21:01:19Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1100 +# $Id: getmaskingstatus.py 15749 2010-03-04 11:23:09Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1101
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1102 __all__ = ['getmaskingstatus']
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1103
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1104 +import sys
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1105 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1106 import portage
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1107 from portage import eapi_is_supported, _eapi_is_deprecated
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1108 from portage.dep import match_from_list
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1109 @@ -11,6 +13,9 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1110 from portage.package.ebuild.config import config
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1111 from portage.versions import catpkgsplit, cpv_getkey
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1112
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1113 +if sys.hexversion >= 0x3000000:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1114 + basestring = str
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1115 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1116 def getmaskingstatus(mycpv, settings=None, portdb=None):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1117 if settings is None:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1118 settings = config(clone=portage.settings)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1119 Index: pym/portage/proxy/lazyimport.py
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1120 ===================================================================
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1121 --- a/pym/portage/proxy/lazyimport.py (revision 15731)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1122 +++ b/pym/portage/proxy/lazyimport.py (revision 15814)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1123 @@ -1,6 +1,6 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1124 # Copyright 2009 Gentoo Foundation
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1125 # Distributed under the terms of the GNU General Public License v2
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1126 -# $Id: lazyimport.py 14327 2009-09-21 16:07:07Z arfrever $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1127 +# $Id: lazyimport.py 15782 2010-03-09 02:42:40Z zmedico $
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1128
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1129 __all__ = ['lazyimport']
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1130
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1131 @@ -20,6 +20,24 @@
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1132 _module_proxies = {}
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1133 _module_proxies_lock = threading.RLock()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1134
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1135 +def _preload_portage_submodules():
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1136 + """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1137 + Load lazily referenced portage submodules into memory,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1138 + so imports won't fail during portage upgrade/downgrade.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1139 + Note that this recursively loads only the modules that
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1140 + are lazily referenced by currently imported modules,
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1141 + so some portage submodules may still remain unimported
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1142 + after this function is called.
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1143 + """
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1144 + while True:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1145 + remaining = False
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1146 + for name in list(_module_proxies):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1147 + if name.startswith('portage.'):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1148 + remaining = True
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1149 + _unregister_module_proxy(name)
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1150 + if not remaining:
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1151 + break
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1152 +
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1153 def _register_module_proxy(name, proxy):
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1154 _module_proxies_lock.acquire()
25607cc50c8f Update gentoo-stage1 build to actually build portage. (Doesn't install a tree yet.) Rob Landley <rob@landley.net> parents: diff changeset	1155 try:

Mercurial > hg > aboriginal

annotate sources/native-builds/gentoo-bootstrap/patches/portage-2.1.8.3.patch @ 1251:204238871b7c