-
Notifications
You must be signed in to change notification settings - Fork 234
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
composefs: add parent directory if missing #1929
composefs: add parent directory if missing #1929
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe 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 |
LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM otherwise.
@@ -218,7 +233,7 @@ func GenerateDump(tocI interface{}, verityDigests map[string]string) (io.Reader, | |||
Mode: 0o755, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn’t this special case for /
now redundant with the new logic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could drop the condition || (sanitizeName(toc.Entries[0].Name) != "/")
but we still need it for len(toc.Entries) == 0
as we never call dumpNode()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I didn’t realize that was also a practical possibility.
I do think removing the second condition would be valuable in itself — and it would make the “empty entries” special case a bit more noticeable.
bcb1352
to
2c6d8a5
Compare
it solves this error with mkcomposefs when the TOC doesn't specify the parent directory for an entry: Error: committing the finished image: failed to put layer using a partial pull: failed to convert json to erofs: exit status 1: mkcomposefs: Parent directory missing for /usr/share/locale/ca/LC_MESSAGES/libc.mo Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2c6d8a5
to
6b1c044
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
it solves this error with mkcomposefs when the TOC doesn't specify the parent directory for an entry:
Error: committing the finished image: failed to put layer using a partial pull: failed to convert json to erofs: exit status 1: mkcomposefs: Parent directory missing for /usr/share/locale/ca/LC_MESSAGES/libc.mo