[gentoo-commits] proj/portage:prefix commit in: pym/portage/dbapi/

[Fabian Groffen]

commit:     82ca805538e526e1e338c6bfae1a5b17a40f7b5e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 16:35:32 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 16:35:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=82ca8055

vartree.py: use _contents.unmap_key when returning pkg

 pym/portage/dbapi/vartree.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 83fe5d3e1..9df69860f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2954,10 +2954,8 @@ class dblink(object):
 
                if pkgfiles and destfile in pkgfiles:
                        if preserve_case is not None:
-                               return preserve_case[destfile]
-                       return destfile
-               #if self._contents.contains(destfile):
-               #       return self._contents.unmap_key(destfile)
+                               return 
self._contents.contains(preserve_case[destfile])
+                       return self._contents.unmap_key(destfile)
                if pkgfiles:
                        basename = os_filename_arg.path.basename(destfile)
                        if self._contents_basenames is None:
@@ -3050,10 +3048,8 @@ class dblink(object):
                                        x = os_filename_arg.path.join(p_path, 
basename)
                                        if x in pkgfiles:
                                                if preserve_case is not None:
-                                                       return preserve_case[x]
-                                               return x
-                                       #if self._contents.contains(x):
-                                       #       return 
self._contents.unmap_key(x)
+                                                       return 
self._contents.unmap_key(preserve_case[x])
+                                               return 
self._contents.unmap_key(x)
 
                return False