pkg/archive.statDifferent(): care about mtime for directories #1962
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nalind
force-pushed
the
dir-timestamps-matter
branch
from
2e84a44
to
3e80155
Compare
When considering changes, don't ignore differences between directories when their mtimes are the only thing we check that's changed. This creates a difference in behavior between the vfs and overlay drivers that shows up in build conformance tests. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
nalind
force-pushed
the
dir-timestamps-matter
branch
from
3e80155
to
8182bef
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, nalind 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 |
mtrmac
reviewed
Jun 12, 2024
| // Don't look at size for dirs, its not a good measure of change | ||
| (oldStat.Mode()&unix.S_IFDIR != unix.S_IFDIR && | ||
| (!sameFsTimeSpec(oldStat.Mtim(), newStat.Mtim()) || (oldStat.Size() != newStat.Size()))) { | ||
| (!sameFsTimeSpec(oldStat.Mtim(), newStat.Mtim()) || (oldStat.Size() != newStat.Size())) { |
There was a problem hiding this comment.
The code is now not making a special case for directories, while the comment still says it does.
Also the sameFsTimeSpec is now AFAICS happening redundantly twice.
A typo?
There was a problem hiding this comment.
Good catch! I kept the wrong check there. PR incoming.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When considering changes, don't ignore differences between directories when their mtimes are the only thing we check that's changed. This creates a difference in behavior between the vfs and overlay drivers that shows up in build conformance tests, such as in containers/buildah#5492.