Repository navigation
fix: restore #146, #160 and #161 work dropped by the 09-30 batch merge - #166
Merged
Merged
Conversation
The #141 merge (40d5a65) took an old copy of ebuild/cli/commands.py and deleted three merged features. It now has runner args for flash (#161), the lockfile read before resolving (#146) and ninja_command() (#160) again. #141's own change stays: executable_output_path comes from ebuild.build.layout. The #137 merge (18b3ee5) replaced #138's archive rule, which runs recreate_archive.py by path, with an inline python -c command. #138's helper and tests were still in the tree, so its rule is back. The helper checks that the archiver can run before it unlinks $out. The archive-member tests from #137 and #138 expected keep.o. Since #133, _object_path keeps the source extension, so the member is keep.c.o. Also fixes ruff's 13 trailing-whitespace errors in tests/unit/cli/test_commands_utils.py. Fixes #165
This file contains hidden or 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
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 #165
Summary
masterhas been red since the 09-30 batch merge. This puts back the merged work that two merge resolutions removed, and keeps what each of those PRs was meant to change._resolve_runner_args,flash --config,--no-runner-args, passthrough args)ninja_command()inbuildrecreate_archive.pyarchive rule#141's real change stays:
executable_output_pathis imported fromebuild.build.layout.I rebuilt
commands.pywith a 3-way merge rather than editing it by hand: base = 40d5a65, ours = current master, theirs = 40d5a65^1 with #141's import change applied. There were no conflicts. Master's CRLF line endings are kept, so the diff contains only content changes.The archive-member assertions now expect
keep.c.o/removed.c.o. That is the naming_object_pathhas used since #133.Test evidence (Ubuntu 20.04 WSL2, Python 3.12.14)
pytest tests --no-covruff check .yamllint .mypy . --ignore-missing-imports --no-strict-optional --exclude '^(layers|core|promo)/'Not verified locally: the Windows and macOS CI legs. CI on this PR will cover them.