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 7AF0C138351 for ; Fri, 10 Apr 2020 21:04:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45835E0A9B; Fri, 10 Apr 2020 21:04:41 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FE4DE0A9B for ; Fri, 10 Apr 2020 21:04:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F168034EF51 for ; Fri, 10 Apr 2020 21:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF02B1EB for ; Fri, 10 Apr 2020 21:04:37 +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: <1586540728.220df6a5d255b308e7d912ba1a358ac891e2becb.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: 220df6a5d255b308e7d912ba1a358ac891e2becb X-VCS-Branch: master Date: Fri, 10 Apr 2020 21:04:37 +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: b6360116-2b0d-4213-b041-7d99e82f3df8 X-Archives-Hash: 24266c8a9b3abc14969f2abe3adf6e9c commit: 220df6a5d255b308e7d912ba1a358ac891e2becb Author: Matt Turner gentoo org> AuthorDate: Fri Apr 10 17:10:40 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 10 17:45:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=220df6a5 catalyst: Drop ancient portage support Signed-off-by: Matt Turner gentoo.org> targets/stage1/build.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/targets/stage1/build.py b/targets/stage1/build.py index 4373126b..069d8d32 100755 --- a/targets/stage1/build.py +++ b/targets/stage1/build.py @@ -3,19 +3,14 @@ import os import sys import portage +from portage.util import grabfile_package, stack_lists # this loads files from the profiles ... # wrap it here to take care of the different # ways portage handles stacked profiles # last case is for portage-2.1_pre* def scan_profile(path): - if "grab_stacked" in dir(portage): - return portage.grab_stacked(path, portage.settings.profiles, portage.grabfile, incremental_lines=1) - else: - if "grab_multiple" in dir(portage): - return portage.stack_lists(portage.grab_multiple(path, portage.settings.profiles, portage.grabfile), incremental=1) - else: - return portage.stack_lists([portage.grabfile_package(os.path.join(x, path)) for x in portage.settings.profiles], incremental=1) + return stack_lists([grabfile_package(os.path.join(x, path)) for x in portage.settings.profiles], incremental=1) # loaded the stacked packages / packages.build files pkgs = scan_profile("packages")