From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD7BA139694 for ; Fri, 24 Mar 2017 19:09:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2425C21C08A; Fri, 24 Mar 2017 19:09:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00CAE21C08A for ; Fri, 24 Mar 2017 19:09:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CC20341664 for ; Fri, 24 Mar 2017 19:09:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE9A373A3 for ; Fri, 24 Mar 2017 19:09:51 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1490373332.82ca805538e526e1e338c6bfae1a5b17a40f7b5e.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 82ca805538e526e1e338c6bfae1a5b17a40f7b5e X-VCS-Branch: prefix Date: Fri, 24 Mar 2017 19:09:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0b60ea64-bfe5-4fae-9faa-58445221a034 X-Archives-Hash: 62ad76964c6a2bd42dd0e3dbebe5c53f commit: 82ca805538e526e1e338c6bfae1a5b17a40f7b5e Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 24 16:35:32 2017 +0000 Commit: Fabian Groffen gentoo 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