From f8d09956c3e361cffb07ae6c3de3d6e333ebbf24 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Tue, 13 Mar 2018 07:58:10 -0500 Subject: [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir Having a flat package.keywords file is causing a failure with recent catalyst, example failure log here: https://archives.gentoo.org/gentoo-releng-autobuilds/message/8ae8a75448fef84e2249e4154e271b34 Log excerpt: --- Running action sequence: setup_confdir Configuring /etc/portage... cannot delete non-empty directory: package.keywords could not make way for new regular file: package.keywords This patch switches to dir structure and uses the new preferred location package.accept_keywords. --- .../portage/{package.keywords => package.accept_keywords/gentoo-sources} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename releases/weekly/specs/s390/s390/netboot/portage/{package.keywords => package.accept_keywords/gentoo-sources} (100%) diff --git a/releases/weekly/specs/s390/s390/netboot/portage/package.keywords b/releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources similarity index 100% rename from releases/weekly/specs/s390/s390/netboot/portage/package.keywords rename to releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources -- 2.16.2