diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2005-04-16 23:49:19 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2005-04-16 23:49:19 +0000 |
| commit | 1b85f98c10575b9e8e554bbd0d537c4ce17fa6ca (patch) | |
| tree | b46c037f3503d6839d382bd5d44f2b8061147321 | |
| parent | update example (diff) | |
| download | portage-cvs-1b85f98c10575b9e8e554bbd0d537c4ce17fa6ca.tar.gz portage-cvs-1b85f98c10575b9e8e554bbd0d537c4ce17fa6ca.tar.bz2 portage-cvs-1b85f98c10575b9e8e554bbd0d537c4ce17fa6ca.zip | |
eclass_config treachery. Check for the eclass_cache.eclasses wasn't properly accounting for mtime (head gets it right, stable was
lacking the full check for some reason).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pym/portage.py | 23 |
2 files changed, 9 insertions, 20 deletions
@@ -1,12 +1,16 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.93 2005/04/13 15:28:37 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.94 2005/04/16 23:49:19 ferringb 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. + 17 Apr 2005; Brian Harring <ferringb@gentoo.org> pym/portage.py: eclass cache + touche up, mtime wasn't being properly checked (thanks to swegener for catching + it). + 13 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/repoman: Downgraded the nesteddie check to a warning as it sometimes has false positives. diff --git a/pym/portage.py b/pym/portage.py index 7f0064e..8d4fa5c 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.54 2005/04/13 15:28:38 jstubbs Exp $ -cvs_id_string="$Id: portage.py,v 1.524.2.54 2005/04/13 15:28:38 jstubbs Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.55 2005/04/16 23:49:19 ferringb Exp $ +cvs_id_string="$Id: portage.py,v 1.524.2.55 2005/04/16 23:49:19 ferringb Exp $"[5:-2] -VERSION="$Revision: 1.524.2.54 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.524.2.55 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -5006,25 +5006,10 @@ class eclass_cache: if not (self.packages[location][cat].has_key(pkg) and self.packages[location][cat][pkg] and eclass_list): return 0 -# eclass_list.sort() -# eclass_list = portage_util.unique_array(eclass_list) - -# ec_data = self.packages[location][cat][pkg].keys() -# ec_data.sort() -# if eclass_list != ec_data: -# return 0 - myp = self.packages[location][cat][pkg] for x in eclass_list: - if not (x in self.eclasses and x in myp and myp[x][:1] == self.eclasses[x][:1]): + if not (x in self.eclasses and x in myp and myp[x] == self.eclasses[x]): return 0 -# if x not in self.eclasses: -# return 0 -# data = self.packages[location][cat][pkg][x] -# if data[1] != self.eclasses[x][1]: -# return 0 -# if data[0] != self.eclasses[x][0]: -# return 0 return 1 |