From 445f0d70d3624bc108b08da6d370bf194fcfc4ac Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 29 Aug 2010 23:49:32 -0700 Subject: Always check if vardbapi._linkmap and vardbapi._plib_registry are None before trying to use them. This will be useful in the 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/main.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pym/_emerge/main.py') diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 4b77f3b1f..3bd72226f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -211,6 +211,11 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): def display_preserved_libs(vardbapi, myopts): MAX_DISPLAY = 3 + if vardbapi._linkmap is None or \ + vardbapi._plib_registry is None: + # preserve-libs is entirely disabled + return + # Ensure the registry is consistent with existing files. vardbapi._plib_registry.pruneNonExisting() -- cgit v1.2.3-1-g7c22