commit:     b018b455193f5c19f10029b6d0ff9f570ebd25f9
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 12:58:10 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gmail <DOT> com>
CommitDate: Tue Mar 13 13:12:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=b018b455

s390[,x]: 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
 .../portage/{package.keywords => package.accept_keywords/gentoo-sources}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/releases/weekly/specs/s390/s390x/netboot/portage/package.keywords 
b/releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources
similarity index 100%
rename from releases/weekly/specs/s390/s390x/netboot/portage/package.keywords
rename to 
releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources

Reply via email to