| 1 |
commit: 3b74444f6684d7696e549cbdb76b8d1a0795fe2d |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 18:39:04 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 18:39:04 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3b74444f |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
|
| 11 |
bin/repoman | 5 +- |
| 12 |
cnf/make.globals | 3 + |
| 13 |
man/make.conf.5 | 15 ++++++- |
| 14 |
man/repoman.1 | 3 +- |
| 15 |
pym/_emerge/EbuildBuild.py | 2 +- |
| 16 |
pym/_emerge/actions.py | 3 + |
| 17 |
pym/_emerge/main.py | 43 +++++++++++++++++-- |
| 18 |
pym/portage/const.py | 3 +- |
| 19 |
.../package/ebuild/_config/special_env_vars.py | 2 +- |
| 20 |
pym/portage/package/ebuild/doebuild.py | 4 +- |
| 21 |
pym/portage/tests/emerge/test_simple.py | 7 +-- |
| 22 |
pym/portage/tests/repoman/test_simple.py | 7 ++- |
| 23 |
pym/portage/util/env_update.py | 1 + |
| 24 |
13 files changed, 77 insertions(+), 21 deletions(-) |
| 25 |
|
| 26 |
diff --cc cnf/make.globals |
| 27 |
index ae98d16,fcd0b41..7aaec5e |
| 28 |
--- a/cnf/make.globals |
| 29 |
+++ b/cnf/make.globals |
| 30 |
@@@ -101,9 -101,10 +101,12 @@@ PORTAGE_RSYNC_OPTS="--recursive --link |
| 31 |
# message should be produced. |
| 32 |
PORTAGE_SYNC_STALE="30" |
| 33 |
|
| 34 |
+ # Executed before emerge exit if FEATURES=clean-logs is enabled. |
| 35 |
+ PORT_LOGDIR_CLEAN="find \"\${PORT_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete" |
| 36 |
+ |
| 37 |
# Minimal CONFIG_PROTECT |
| 38 |
+# NOTE: in Prefix, these are NOT prefixed on purpose, because the |
| 39 |
+# profiles define them too |
| 40 |
CONFIG_PROTECT="/etc" |
| 41 |
CONFIG_PROTECT_MASK="/etc/env.d" |
Archives