diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-05-01 12:46:51 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-05-01 12:46:51 +0000 |
| commit | 34f1ee3d20e006271194ba38ba3df3a5f40c5294 (patch) | |
| tree | 8c2fdd7a08a97ac68efcdf0daf14cd755a5a2171 | |
| parent | Skip testing if has already been performed (indicated by .tested) (diff) | |
| download | portage-cvs-34f1ee3d20e006271194ba38ba3df3a5f40c5294.tar.gz portage-cvs-34f1ee3d20e006271194ba38ba3df3a5f40c5294.tar.bz2 portage-cvs-34f1ee3d20e006271194ba38ba3df3a5f40c5294.zip | |
Added checking of overlays for package.mask, categories and others.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | pym/portage.py | 10 |
2 files changed, 11 insertions, 4 deletions
@@ -1,12 +1,15 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.114 2005/05/01 09:02:41 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.115 2005/05/01 12:46:51 jstubbs Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 01 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Added + checking of overlays for package.mask, categories and others. + 01 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Skip testing if has already been performed (indicated by .tested) diff --git a/pym/portage.py b/pym/portage.py index 1e6bcfa..12580f6 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,10 +1,10 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.67 2005/05/01 04:08:54 jstubbs Exp $ -cvs_id_string="$Id: portage.py,v 1.524.2.67 2005/05/01 04:08:54 jstubbs Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.68 2005/05/01 12:46:51 jstubbs Exp $ +cvs_id_string="$Id: portage.py,v 1.524.2.68 2005/05/01 12:46:51 jstubbs Exp $"[5:-2] -VERSION="$Revision: 1.524.2.67 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.524.2.68 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -1047,6 +1047,10 @@ class config: self.punmaskdict = {} else: locations = [self["PORTDIR"] + "/profiles", USER_CONFIG_PATH] + for ov in self["PORTDIR_OVERLAY"].split(): + ov = os.path.normpath(ov) + if os.path.isdir(ov+"/profiles"): + locations.append(ov+"/profiles") pusedict=grabdict_package(USER_CONFIG_PATH+"/package.use") self.pusedict = {} |