diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-31 19:54:19 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-31 19:54:19 -0700 |
| commit | d7579ecd27ca051d7f987102caeb53e826a6fe93 (patch) | |
| tree | b1192edbeeffea84b8817522c5e7697100163a8f /pym/portage/dbapi/vartree.py | |
| parent | ce501b36d7078db059c606d3b4f38637ad09528e (diff) | |
| download | portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.tar.gz portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.tar.bz2 portage-d7579ecd27ca051d7f987102caeb53e826a6fe93.zip | |
Revert "xml/metadata: implement XMLParser.doctype()"
This reverts commit ce501b36d7078db059c606d3b4f38637ad09528e.
This commit had lots of unintended changes included.
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0c0ed6a64..1a38d421a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1980,11 +1980,10 @@ class dblink(object): unmerge_desc["!mtime"] = _("!mtime") unmerge_desc["!obj"] = _("!obj") unmerge_desc["!sym"] = _("!sym") - unmerge_desc["!prefix"] = _("!prefix") real_root = self.settings['ROOT'] real_root_len = len(real_root) - 1 - eroot = self.settings["EROOT"] + eroot_split_len = len(self.settings["EROOT"].split(os.sep)) - 1 # These files are generated by emerge, so we need to remove # them when they are the only thing left in a directory. @@ -2024,12 +2023,6 @@ class dblink(object): file_data = pkgfiles[objkey] file_type = file_data[0] - - # don't try to unmerge the prefix offset itself - if len(obj) <= len(eroot) or not obj.startswith(eroot): - show_unmerge("---", unmerge_desc["!prefix"], file_type, obj) - continue - statobj = None try: statobj = os.stat(obj) |