summaryrefslogtreecommitdiffstats
path: root/pym/_emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-29 22:36:22 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-29 22:36:22 -0700
commit3dfe2a64ef0c49917435f9f79bc2b5890fae90e0 (patch)
treee9eab8ded003a708622e6678edbc101500d6615c /pym/_emerge
parente189d132728fcc6efa7df5d6c0c6598209ca446d (diff)
downloadportage-3dfe2a64ef0c49917435f9f79bc2b5890fae90e0.tar.gz
portage-3dfe2a64ef0c49917435f9f79bc2b5890fae90e0.tar.bz2
portage-3dfe2a64ef0c49917435f9f79bc2b5890fae90e0.zip
Rename vardbapi.plib_registry to vardbapi._plib_registry since I'm
trying to minimize the diff between the master branch and upcoming 2.1.9 branch which will not have preserve-libs support but will still have the code in private and disabled form.
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/actions.py2
-rw-r--r--pym/_emerge/main.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 815032d14..9f184bb6b 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -447,7 +447,7 @@ def action_build(settings, trees, mtimedb,
portage.writemsg_stdout(colorize("WARN", "WARNING:")
+ " AUTOCLEAN is disabled. This can cause serious"
+ " problems due to overlapping packages.\n")
- trees[settings["ROOT"]]["vartree"].dbapi.plib_registry.pruneNonExisting()
+ trees[settings["ROOT"]]["vartree"].dbapi._plib_registry.pruneNonExisting()
return retval
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 81a868748..7efa35692 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -212,9 +212,9 @@ def display_preserved_libs(vardbapi, myopts):
MAX_DISPLAY = 3
# Ensure the registry is consistent with existing files.
- vardbapi.plib_registry.pruneNonExisting()
+ vardbapi._plib_registry.pruneNonExisting()
- if vardbapi.plib_registry.hasEntries():
+ if vardbapi._plib_registry.hasEntries():
if "--quiet" in myopts:
print()
print(colorize("WARN", "!!!") + " existing preserved libs found")
@@ -223,7 +223,7 @@ def display_preserved_libs(vardbapi, myopts):
print()
print(colorize("WARN", "!!!") + " existing preserved libs:")
- plibdata = vardbapi.plib_registry.getPreservedLibs()
+ plibdata = vardbapi._plib_registry.getPreservedLibs()
linkmap = vardbapi.linkmap
consumer_map = {}
owners = {}