[gentoo-releng] [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[gentoo-releng] [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[Ben Kohler]

[-- Attachment #1: Type: text/plain, Size: 99 bytes --]

Attached is a small mv-only patch to fix recent s390 netboot build
failures.  Please review.

-Ben

[-- Attachment #2: 0001-s390-mv-flat-package.keywords-file-to-package.accept.patch --]
[-- Type: text/x-patch, Size: 1359 bytes --]

From f8d09956c3e361cffb07ae6c3de3d6e333ebbf24 Mon Sep 17 00:00:00 2001
From: Ben Kohler <bkohler@gmail.com>
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

[gentoo-releng] Re: [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[Ben Kohler]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

Realized moments later that this fix needs applied to s390x as well,
patch updated.

-Ben

On Tue, Mar 13, 2018 at 8:08 AM, Ben Kohler <bkohler@gmail.com> wrote:
> Attached is a small mv-only patch to fix recent s390 netboot build
> failures.  Please review.
>
> -Ben

[-- Attachment #2: 0001-s390-x-mv-flat-package.keywords-file-to-package.acce.patch --]
[-- Type: text/x-patch, Size: 1935 bytes --]

From b018b455193f5c19f10029b6d0ff9f570ebd25f9 Mon Sep 17 00:00:00 2001
From: Ben Kohler <bkohler@gmail.com>
Date: Tue, 13 Mar 2018 07:58:10 -0500
Subject: [PATCH] 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(-)
 rename releases/weekly/specs/s390/s390/netboot/portage/{package.keywords => package.accept_keywords/gentoo-sources} (100%)
 rename releases/weekly/specs/s390/s390x/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
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
-- 
2.16.2

Re: [gentoo-releng] [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[Jorge Manuel B. S. Vicetto]

Hi Ben.

On Tue, Mar 13, 2018 at 12:08 PM, Ben Kohler <bkohler@gmail.com> wrote:
> Attached is a small mv-only patch to fix recent s390 netboot build
> failures.  Please review.
>
> -Ben

There was only one potential issue I could see with that change, but
I've now confirmed it isn't a problem. We have hard coded the
directory names for doing the "cleaning", but we have both
package.accept_keywords and package.keywords in that list.
https://gitweb.gentoo.org/proj/catalyst.git/tree/catalyst/base/stagebase.py
line 1221

BTW, I just noticed the following typo in line 1220 "portage_preix":
log.debug("clean(), portage_preix = %s, no sticky-config",
self.settings["portage_prefix"])

Please grant S390 (vapier?) until the weekend to reply. If there's no
reply or if they agree, feel free to commit the change.
Thanks,

Jorge

Re: [gentoo-releng] [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[Ben Kohler]

Yeah, when troubleshooting the portage_prefix code last time I made
sure that the "new" p.a_k location was in the cleanup list.
Eventually I'd like to rename all package.keywords dirs in the repo to
package.accept_keywords, since this has been the official correct
location for many years now.

-Ben

On Tue, Mar 13, 2018 at 8:23 AM, Jorge Manuel B. S. Vicetto
<jmbsvicetto@gentoo.org> wrote:
> Hi Ben.
>
> On Tue, Mar 13, 2018 at 12:08 PM, Ben Kohler <bkohler@gmail.com> wrote:
>> Attached is a small mv-only patch to fix recent s390 netboot build
>> failures.  Please review.
>>
>> -Ben
>
> There was only one potential issue I could see with that change, but
> I've now confirmed it isn't a problem. We have hard coded the
> directory names for doing the "cleaning", but we have both
> package.accept_keywords and package.keywords in that list.
> https://gitweb.gentoo.org/proj/catalyst.git/tree/catalyst/base/stagebase.py
> line 1221
>
> BTW, I just noticed the following typo in line 1220 "portage_preix":
> log.debug("clean(), portage_preix = %s, no sticky-config",
> self.settings["portage_prefix"])
>
> Please grant S390 (vapier?) until the weekend to reply. If there's no
> reply or if they agree, feel free to commit the change.
> Thanks,
>
> Jorge
>

[gentoo-releng] Re: [PATCH] s390: mv flat package.keywords file to package.accept_keywords dir

[Ben Kohler]

On Tue, Mar 13, 2018 at 8:14 AM, Ben Kohler <bkohler@gmail.com> wrote:
> Realized moments later that this fix needs applied to s390x as well,
> patch updated.
>
> -Ben
>
> On Tue, Mar 13, 2018 at 8:08 AM, Ben Kohler <bkohler@gmail.com> wrote:
>> Attached is a small mv-only patch to fix recent s390 netboot build
>> failures.  Please review.
>>
>> -Ben

Pushed.

-Ben