commit: 220df6a5d255b308e7d912ba1a358ac891e2becb
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 17:10:40 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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")
