diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-29 23:31:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-29 23:31:47 -0700 |
| commit | 2f351c8a47472560c5f1bd063efc8a97ed56636f (patch) | |
| tree | 467d9026070f06b747958ef09db4ac0d1d6040bf /pym/_emerge | |
| parent | 3dfe2a64ef0c49917435f9f79bc2b5890fae90e0 (diff) | |
| download | portage-2f351c8a47472560c5f1bd063efc8a97ed56636f.tar.gz portage-2f351c8a47472560c5f1bd063efc8a97ed56636f.tar.bz2 portage-2f351c8a47472560c5f1bd063efc8a97ed56636f.zip | |
Rename vardbapi.linkmap to vardbapi._linkmap 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.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/clear_caches.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 9f184bb6b..a2cff5957 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -881,7 +881,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, # with consumers that have not been selected for removal. If so, these # packages and any dependencies need to be added to the graph. real_vardb = trees[myroot]["vartree"].dbapi - linkmap = real_vardb.linkmap + linkmap = real_vardb._linkmap consumer_cache = {} provider_cache = {} consumer_map = {} diff --git a/pym/_emerge/clear_caches.py b/pym/_emerge/clear_caches.py index 5999f281a..a0e945255 100644 --- a/pym/_emerge/clear_caches.py +++ b/pym/_emerge/clear_caches.py @@ -10,6 +10,6 @@ def clear_caches(trees): d["porttree"].dbapi._aux_cache.clear() d["bintree"].dbapi._aux_cache.clear() d["bintree"].dbapi._clear_cache() - d["vartree"].dbapi.linkmap._clear_cache() + d["vartree"].dbapi._linkmap._clear_cache() dircache.clear() gc.collect() diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 7efa35692..4b77f3b1f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -224,7 +224,7 @@ def display_preserved_libs(vardbapi, myopts): print(colorize("WARN", "!!!") + " existing preserved libs:") plibdata = vardbapi._plib_registry.getPreservedLibs() - linkmap = vardbapi.linkmap + linkmap = vardbapi._linkmap consumer_map = {} owners = {} linkmap_broken = False |