Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/, ...
Date: Wed, 21 Mar 2018 12:52:31
Message-Id: 1520946748.b018b455193f5c19f10029b6d0ff9f570ebd25f9.ianbem@gentoo
1 commit: b018b455193f5c19f10029b6d0ff9f570ebd25f9
2 Author: Ben Kohler <bkohler <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 13 12:58:10 2018 +0000
4 Commit: Ben Kohler <bkohler <AT> gmail <DOT> com>
5 CommitDate: Tue Mar 13 13:12:28 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b018b455
7
8 s390[,x]: mv flat package.keywords file to package.accept_keywords dir
9
10 Having a flat package.keywords file is causing a failure with recent
11 catalyst, example failure log here:
12
13 https://archives.gentoo.org/gentoo-releng-autobuilds/message/8ae8a75448fef84e2249e4154e271b34
14
15 Log excerpt:
16
17 --- Running action sequence: setup_confdir
18 Configuring /etc/portage...
19 cannot delete non-empty directory: package.keywords
20 could not make way for new regular file: package.keywords
21
22 This patch switches to dir structure and uses the new preferred location
23 package.accept_keywords.
24
25 .../portage/{package.keywords => package.accept_keywords/gentoo-sources} | 0
26 .../portage/{package.keywords => package.accept_keywords/gentoo-sources} | 0
27 2 files changed, 0 insertions(+), 0 deletions(-)
28
29 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
30 similarity index 100%
31 rename from releases/weekly/specs/s390/s390/netboot/portage/package.keywords
32 rename to releases/weekly/specs/s390/s390/netboot/portage/package.accept_keywords/gentoo-sources
33
34 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
35 similarity index 100%
36 rename from releases/weekly/specs/s390/s390x/netboot/portage/package.keywords
37 rename to releases/weekly/specs/s390/s390x/netboot/portage/package.accept_keywords/gentoo-sources