Misc fixes #13017
Merged
Misc fixes #13017
+9
−6
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
dnicolodi
reviewed
Mar 29, 2024
mesonbuild/utils/universal.py
Outdated
| if o: | ||
| mlog.debug(f'stdout:\n{o.strip()}\n-----------') | ||
| if e: | ||
| mlog.debug(f'stderr:\n{e.strip()}\n-----------') |
There was a problem hiding this comment.
I don't think it matters, but this is a slight behavior change: before there would be no debug message for stdout or stderr being only whitespace. Now the stdout: and stderr: headers are printed anyway.
There was a problem hiding this comment.
Now that I think about it, I believe that was actually my original reason for writing the original version the way I did. Drat.
tristan957
reviewed
Apr 11, 2024
It is generally accepted practice to convert dict.keys() to a list before iterating over it and e.g. deleting values, as keys returns a live-action view. In this case, we use the difference of *two* dict keys, which returns a regular non-view set and doesn't need protecting. Iteration order doesn't matter (the set already randomizes it anyway). Avoid the cost of converting to a list.
Popen_safe_logged has a small inefficiency. It evaluates the stripped version of stdout/stderr before checking if it exists, for logging purposes. This would sometimes crash, if it was None instead of ''. Fixes mesonbuild#12979
Any code that needs to know mesonlib.python_command currently assumes the PyInstaller bundle reference is added to the sys module, which means that it assumes the only freeze tool used is PyInstaller. Really, all we need to check is sys.frozen as it's never normally set, but always set for a freeze. We don't care if it was PyInstaller specifically, and we don't need its bundle directory. See mesonbuild#13007
We have two copies of other.h, one of which is generated. If we don't include the include/ directory then building fails unless the custom_target which copies it over, happens to run early enough. On parallel builds this may fall on its face.
eli-schwartz
force-pushed
the
misc-fixes
branch
from
1fd7c0f to
1baabbc
Compare
tristan957
approved these changes
Apr 15, 2024
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.
Fixes #12979