[release-1.51] Backport ignore chown errors in additionalimagestore #1990
Conversation
instead of removing the "merged" directory, replace it with a fresh empty directory so that we can assume "merged" is always present and there is no need to recreate it. Signed-off-by: Giuseppe Scrivano <[email protected]>
ignore errors creating and chowning the diffDiff if it is in an additional image store. Signed-off-by: Giuseppe Scrivano <[email protected]>
| if _, err := os.Stat(mergedDir); err != nil && os.IsNotExist(err) { | ||
| if err := idtools.MkdirAs(mergedDir, 0o700, rootUID, rootGID); err != nil && !os.IsExist(err) { | ||
| return "", err | ||
| } |
There was a problem hiding this comment.
@giuseppe please eyeball this. In the picked commit, it uses dir instead of workDirBase as listed here in line 1682. I think this is OK, but would like your verification.
|
Hold for now. If tests pass, I'll add another commit to bump the version, then work on getting a release out. |
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/acel244-1.51
branch
from
fcfcab9
to
7f8ed41
Compare
follow-up for ccb70a7 more information here: containers#1827 (comment) Addresses: https://issues.redhat.com/browse/ACCELFIX-244 Signed-off-by: Giuseppe Scrivano <[email protected]> Signed-off-by: tomsweeneyredhat <[email protected]>
Bump lint in the test area to 1.55.2 and then address an append that's causing lint heartache. Signed-off-by: tomsweeneyredhat <[email protected]>
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/acel244-1.51
branch
from
7f8ed41
to
62c81b3
Compare
|
@giuseppe PTAL, if it LGTY, I'll add a version bump so we can move forward with this. I'll also backport to the release-1.45 branch. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, TomSweeneyRedHat The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
As the title says. In preparation for https://issues.redhat.com/browse/ACCELFIX-244 Signed-off-by: tomsweeneyredhat <[email protected]>
|
Happy green test buttons here, and this is for a customer hot fix. Can I get a merge please? |
|
LGTM on my end |
|
/lgtm |
|
Given this has a couple of LGTM's and an /lgtm, I'm going to press the manual merge button. |
Backports parts of #1828 and also #1784 to address:
https://issues.redhat.com/browse/ACCELFIX-244