diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-29 13:35:31 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-29 13:35:31 +0200 |
| commit | 178de86d7d646a64dd048b6e3e4afa06a4ea4df0 (patch) | |
| tree | 0b2ea1929463fa31eaf91ec513ae3a6d7bf03414 | |
| parent | 11ec19654d5fd74b148a08a68cd09f0cb83cbf64 (diff) | |
| download | portage-178de86d7d646a64dd048b6e3e4afa06a4ea4df0.tar.gz portage-178de86d7d646a64dd048b6e3e4afa06a4ea4df0.tar.bz2 portage-178de86d7d646a64dd048b6e3e4afa06a4ea4df0.zip | |
use ROOT iso EROOT with PreservedLibsRegistry, since all entries already have EPREFIX
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 | ||||
| -rw-r--r-- | pym/portage/util/_dyn_libs/PreservedLibsRegistry.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index fa309b007..b13506791 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -146,7 +146,7 @@ class vardbapi(dbapi): self._plib_registry = None if _ENABLE_PRESERVE_LIBS: try: - self._plib_registry = PreservedLibsRegistry(self._eroot, + self._plib_registry = PreservedLibsRegistry(self.root, os.path.join(self._eroot, PRIVATE_PATH, "preserved_libs_registry")) except PermissionDenied: diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py index f05028fa9..0d0b57d21 100644 --- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py +++ b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py @@ -21,16 +21,16 @@ from portage.versions import cpv_getkey class PreservedLibsRegistry(object): """ This class handles the tracking of preserved library objects """ - def __init__(self, eroot, filename, autocommit=True): + def __init__(self, root, filename, autocommit=True): """ - @param eroot: root used to check existence of paths in pruneNonExisting - @type eroot: String + @param root: root used to check existence of paths in pruneNonExisting + @type root: String @param filename: absolute path for saving the preserved libs records @type filename: String @param autocommit: determines if the file is written after every update @type autocommit: Boolean """ - self._eroot = eroot + self._root = root self._filename = filename self._autocommit = autocommit self.load() @@ -114,7 +114,7 @@ class PreservedLibsRegistry(object): for cps in list(self._data): cpv, counter, paths = self._data[cps] paths = [f for f in paths \ - if os.path.exists(os.path.join(self._eroot, f.lstrip(os.sep)))] + if os.path.exists(os.path.join(self._root, f.lstrip(os.sep)))] if len(paths) > 0: self._data[cps] = (cpv, counter, paths) else: |