diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-03-03 01:27:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-03 01:27:27 +0000 |
| commit | ad384451156d5c77eabda8f221760255d3931390 (patch) | |
| tree | b7399d195cf180c6978de661ce42fe32a650864f | |
| parent | Fix incorrect merge. (diff) | |
| download | portage-multirepo-ad384451156d5c77eabda8f221760255d3931390.tar.gz portage-multirepo-ad384451156d5c77eabda8f221760255d3931390.tar.bz2 portage-multirepo-ad384451156d5c77eabda8f221760255d3931390.zip | |
Remove preserve libs code from unmerge() that accidentally got merged from
trunk.
svn path=/main/branches/2.1.7/; revision=15727
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d1228458..2f09ecaa 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3335,8 +3335,6 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None, try: mylink.lockdb() if mylink.exists(): - vartree.dbapi.plib_registry.load() - vartree.dbapi.plib_registry.pruneNonExisting() retval = mylink.unmerge(trimworld=mytrimworld, cleanup=1, ldpath_mtimes=ldpath_mtimes) if retval == os.EX_OK: @@ -3344,7 +3342,6 @@ def unmerge(cat, pkg, myroot, mysettings, mytrimworld=1, vartree=None, return retval return os.EX_OK finally: - vartree.dbapi.linkmap._clear_cache() mylink.unlockdb() def write_contents(contents, root, f): |