Add fix for ingesting mixed tarballs #259
Merged
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.
We just had another issue with mixed tarballs that contain both init files and software installations, e.g.:
The tarball has
softwarein its name, and the ingestion script would use the first file in the tarball to verify that this also has a/software/directory in its path, which is not the case here. I've added a fix based on @boegel's suggestion from #142 (comment), but instead I'm using agrep -m 1(this will not have to go through the entire tarball, which could take a long while for large tarballs), which looks for the first file in the tarball listing that actually has the same type as what's in the filename. If the result is empty, I'm falling back to the old method, to make sure that it at least uses something.