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 9F921138350 for ; Fri, 10 Apr 2020 21:04:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0D88E0AC4; Fri, 10 Apr 2020 21:04:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A7542E0AC4 for ; Fri, 10 Apr 2020 21:04:42 +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 B574D34EF43 for ; Fri, 10 Apr 2020 21:04:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 233741EE for ; Fri, 10 Apr 2020 21:04:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586552633.0b5a340f40fb6d273fdb6fa66f17b0af13df8fc2.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/build.py X-VCS-Directories: targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0b5a340f40fb6d273fdb6fa66f17b0af13df8fc2 X-VCS-Branch: master Date: Fri, 10 Apr 2020 21:04:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 660b25c7-cd97-41a0-8200-1ee9d99dc3e4 X-Archives-Hash: bb52a0e3b58b6d5dbdd941c2f6e95e1d commit: 0b5a340f40fb6d273fdb6fa66f17b0af13df8fc2 Author: Matt Turner gentoo org> AuthorDate: Fri Apr 10 17:45:52 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 10 21:03:53 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0b5a340f catalyst: Fix import for portage.dep.dep_getkey Signed-off-by: Matt Turner gentoo.org> targets/stage1/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/stage1/build.py b/targets/stage1/build.py index b95b4182..b01eb9cd 100755 --- a/targets/stage1/build.py +++ b/targets/stage1/build.py @@ -3,6 +3,7 @@ import os import sys import portage +from portage.dep import dep_getkey from portage.util import grabfile_package, stack_lists # this loads files from the profiles ... @@ -24,7 +25,7 @@ buildpkgs = scan_profile("packages.build") # and version numbers) for pkg in pkgs: try: - bidx = buildpkgs.index(portage.dep_getkey(pkg)) + bidx = buildpkgs.index(dep_getkey(pkg)) buildpkgs[bidx] = pkg if buildpkgs[bidx][0:1] == "*": buildpkgs[bidx] = buildpkgs[bidx][1:]