Fix --srcdir handling #237
Merged
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
The order of the directory contents is not predictable, and that was causing the test suite to fail depending on the layout and creation order of the entries. We now sort the return list to guarantee a stable order. Signed-off-by: Guillem Jover <guillem@hadrons.org>
This is an output file, and if its directory is missing we need to create it, otherwise msgmerge will fail. Signed-off-by: Guillem Jover <guillem@hadrons.org>
When destdir has not been specified, srcdir is different to calldir, and we write new output files, we do so in calldir. So when we look for the same files as input, we need to look for them in calldir too, otherwise we will look for possibly outdated ones. Signed-off-by: Guillem Jover <guillem@hadrons.org>
The .pot file was being looked only in the destdir locations, but in this particular call this is in fact an input file. Signed-off-by: Guillem Jover <guillem@hadrons.org>
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.
This fixes several issues with the --srcdir handling so that it does the right thing. These were causing build failures in at least dpkg and aptitude. I've also checked all other instances of find_output_file and they look ok, but a second look would make sense anyway. :)
Fixes Debian bug #960892.