diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-07-15 19:09:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-15 19:09:11 +0000 |
| commit | 35e09c1a73bd5865a708a4c45c9c48e5f70a6f13 (patch) | |
| tree | d082b9f138493df31d15f59179e7c3e062553dc8 /pym/eclass_cache.py | |
| parent | Move normalize_path into portage_util. (diff) | |
| download | portage-idfetch-35e09c1a73bd5865a708a4c45c9c48e5f70a6f13.tar.gz portage-idfetch-35e09c1a73bd5865a708a4c45c9c48e5f70a6f13.tar.bz2 portage-idfetch-35e09c1a73bd5865a708a4c45c9c48e5f70a6f13.zip | |
Remove the portage_file module for bug #133591.
svn path=/main/trunk/; revision=3892
Diffstat (limited to 'pym/eclass_cache.py')
| -rw-r--r-- | pym/eclass_cache.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/eclass_cache.py b/pym/eclass_cache.py index 06616261..1847cbf7 100644 --- a/pym/eclass_cache.py +++ b/pym/eclass_cache.py @@ -1,10 +1,9 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Nicholas Carpaski (carpaski@gentoo.org), Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id:$ +# $Id$ -from portage_util import writemsg -import portage_file +from portage_util import normalize_path, writemsg import os, sys from portage_data import portage_gid @@ -20,7 +19,7 @@ class cache: # screw with the porttree ordering, w/out having bash inherit match it, and I'll hurt you. # ~harring self.porttrees = [self.porttree_root]+overlays - self.porttrees = tuple(map(portage_file.normpath, self.porttrees)) + self.porttrees = tuple(map(normalize_path, self.porttrees)) self._master_eclass_root = os.path.join(self.porttrees[0],"eclass") self.update_eclasses() @@ -40,7 +39,7 @@ class cache: def update_eclasses(self): self.eclasses = {} eclass_len = len(".eclass") - for x in [portage_file.normpath(os.path.join(y,"eclass")) for y in self.porttrees]: + for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]: if not os.path.isdir(x): continue for y in [y for y in os.listdir(x) if y.endswith(".eclass")]: |