diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-29 23:49:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-29 23:49:32 -0700 |
| commit | 445f0d70d3624bc108b08da6d370bf194fcfc4ac (patch) | |
| tree | e38668a619323ff90386bb5b9f622430550570db /pym/_emerge/main.py | |
| parent | 2f351c8a47472560c5f1bd063efc8a97ed56636f (diff) | |
| download | portage-445f0d70d3624bc108b08da6d370bf194fcfc4ac.tar.gz portage-445f0d70d3624bc108b08da6d370bf194fcfc4ac.tar.bz2 portage-445f0d70d3624bc108b08da6d370bf194fcfc4ac.zip | |
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.
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 5 |
1 files changed, 5 insertions, 0 deletions
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() |