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 24A251382C5 for ; Fri, 16 Mar 2018 21:11:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EA44E0882; Fri, 16 Mar 2018 21:11:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CE1CE0882 for ; Fri, 16 Mar 2018 21:11:29 +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 B88DC335C76 for ; Fri, 16 Mar 2018 21:11:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 569BB258 for ; Fri, 16 Mar 2018 21:11:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1521234637.e12f6c3626da36ba558782ff52278be1566c5125.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master 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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e12f6c3626da36ba558782ff52278be1566c5125 X-VCS-Branch: master Date: Fri, 16 Mar 2018 21:11:26 +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: 91da3d91-4294-48d8-a9d5-d98de51c2134 X-Archives-Hash: 585c316f82cf37474dab5b56fa70114b commit: e12f6c3626da36ba558782ff52278be1566c5125 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 16 10:04:58 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 16 21:10:37 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e12f6c36 portage.dbapi.vartree: Remove one more unfounded virtual case Reviewed-by: Zac Medico gentoo.org> pym/portage/dbapi/vartree.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 8b1b77f7d..6406682d6 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3747,13 +3747,6 @@ class dblink(object): is_binpkg = self.settings.get("EMERGE_FROM") == "binary" slot = '' for var_name in ('CHOST', 'SLOT'): - if var_name == 'CHOST' and self.cat == 'virtual': - try: - os.unlink(os.path.join(inforoot, var_name)) - except OSError: - pass - continue - try: with io.open(_unicode_encode( os.path.join(inforoot, var_name),