From 3dfe2a64ef0c49917435f9f79bc2b5890fae90e0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 29 Aug 2010 22:36:22 -0700 Subject: 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. --- pym/_emerge/actions.py | 2 +- pym/_emerge/main.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pym/_emerge') 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 = {} -- cgit v1.2.3-1-g7c22