diff options
| author | Fabian Groffen <grobian@gentoo.org> | 2010-09-09 17:42:51 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-17 14:05:52 -0700 |
| commit | 2ff60644d31d36bd5238040adfad65427d1729ea (patch) | |
| tree | 6e0a38e9b7da7efad55c3695880250e4a20a5c7b | |
| parent | 77238b47f55ed3c29a3d57fd26aeadf1550fd292 (diff) | |
| download | portage-2ff60644d31d36bd5238040adfad65427d1729ea.tar.gz portage-2ff60644d31d36bd5238040adfad65427d1729ea.tar.bz2 portage-2ff60644d31d36bd5238040adfad65427d1729ea.zip | |
don't use EROOT or an upgrade of a package will result in the package being unmerged!
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index ea54433c9..144cc39f8 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1812,6 +1812,9 @@ class dblink(object): unmerge_desc["!obj"] = _("!obj") unmerge_desc["!sym"] = _("!sym") + real_root = self.settings['ROOT'] + real_root_len = len(real_root) - 1 + for i, objkey in enumerate(mykeys): if scheduler is not None and \ @@ -1852,8 +1855,11 @@ class dblink(object): if lstatobj is None: show_unmerge("---", unmerge_desc["!found"], file_type, obj) continue - if obj.startswith(dest_root): - relative_path = obj[dest_root_len:] + # PREFIX LOCAL: don't use EROOT or you will unmerge a + # just upgraded package! + if obj.startswith(real_root): + relative_path = obj[real_root_len:] + # PREFIX LOCAL is_owned = False for dblnk in others_in_slot: if dblnk.isowner(relative_path): |