From 27d481d591f7214a9f7f9e95350593c129ae8fc2 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 25 Oct 2006 17:40:43 +0000 Subject: [PATCH] Merged from trunk 4812:4815 Remove ACCEPT_LICENSE docs until they're really implemented. Improve reconstruct_eclasses error handling. For the time being, write a variation of the old _eclass_ format so that cache written only forces a regen for older versions of portage rather than a ValueError due to failed long() conversion. svn path=/main/branches/prefix/; revision=4816 --- man/make.conf.5 | 6 ------ man/portage.5 | 20 -------------------- pym/cache/template.py | 27 ++++++++++++++++++--------- 3 files changed, 18 insertions(+), 35 deletions(-) diff --git a/man/make.conf.5 b/man/make.conf.5 index dc382fd64..eb04a8533 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -29,12 +29,6 @@ set this to '~ppc'. This is an incremental variable. Only define a .br Defaults to the value of $ARCH. .TP -\fBACCEPT_LICENSE\fR = \fI[space delimited list of licenses]\fR -Specify acceptable licenses for installed packages. Any packages with -unaccepted licenses will be masked. The default value is "*", which means to -accept all licenses. Licenses can be accepted for individual packages via the -package.license file. See \fBportage\fR(5) for more information. -.TP \fBBUILD_PREFIX\fR = \fI[path]\fR Defines the location of the package working directory. .br diff --git a/man/portage.5 b/man/portage.5 index 74ae5335d..cfe71a672 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -43,7 +43,6 @@ virtuals bashrc modules package.keywords -package.license package.mask package.unmask package.use @@ -411,25 +410,6 @@ package.keywords like this: games-fps/quake3-demo -* .TP -.BR package.license -Per\-package acceptance of licenses. This is useful if a license needs to be -accepted for a single package but should not be accepted for any package. See -\fIACCEPT_LICENSE\fR in \fBmake.conf\fR(5) for global license acceptance. - -.I Format: -.nf -\- comments begin with # -\- one DEPEND atom per line followed by additional licenses -.fi - -.I Example: -.nf -# accept the zlib license just for the zlib package -sys-libs/zlib ZLIB -# accept any license for mplayer -media\-video/mplayer * -.fi -.TP .BR package.mask A list of package atoms to mask. Useful if specific versions of packages do not work well for you. For example, you swear by the Nvidia drivers, but only diff --git a/pym/cache/template.py b/pym/cache/template.py index 0e2a5f368..d68138f89 100644 --- a/pym/cache/template.py +++ b/pym/cache/template.py @@ -151,8 +151,18 @@ class database(object): def serialize_eclasses(eclass_dict): """takes a dict, returns a string representing said dict""" + """The "new format", which causes older versions of