Protect qt6-wayland from orphan cleanup - #7396
Open
mdenesfe wants to merge 2 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR ensures qt6-wayland is treated as a core package during the Omarchy 4 (“quattro”) upgrade so it won’t be removed during orphan cleanup.
Changes:
- Add
qt6-waylandto the upgrade script’score_packageslist. - Extend the shell test to assert
qt6-waylandis explicitly included and that core packages are marked explicit.
Reviewed changes
Copilot reviewed 1 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| test/shell.d/upgrade-to-quattro-test.sh | Adds assertions that qt6-wayland is present in the core_packages block and that mark_packages_explicit is called. |
| bin/omarchy-upgrade-to-quattro | Adds qt6-wayland to the core_packages array to protect it from orphan cleanup. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| pass "Omarchy 4 upgrade completes package update checks" | ||
|
|
||
| core_packages_body=$(sed -n '/ local core_packages=(/,/ )/p' "$upgrade_to_quattro") | ||
| grep -Fx ' qt6-wayland' <<<"$core_packages_body" >/dev/null || |
Comment on lines
+31
to
+32
| core_packages_body=$(sed -n '/ local core_packages=(/,/ )/p' "$upgrade_to_quattro") | ||
| grep -Fx ' qt6-wayland' <<<"$core_packages_body" >/dev/null || |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 2 changed files in this pull request and generated no new comments.
Suppressed comments (2)
test/shell.d/upgrade-to-quattro-test.sh:32
- The test’s parsing of
core_packagesis fairly brittle: thesedend pattern only matches a line that is exactly)and thegreprequiresqt6-waylandto be the only token on its line. This can break if the array close is formatted as), or if an inline comment is added (e.g.,qt6-wayland # needed for ...). Consider loosening the patterns (e.g., allow whitespace around)and allow trailing comments/whitespace afterqt6-wayland) so the test verifies intent without being sensitive to formatting changes.
core_packages_body=$(sed -n '/^[[:space:]]*local core_packages=(/,/^[[:space:]]*)$/p' "$upgrade_to_quattro")
printf '%s\n' "$core_packages_body" | grep -Eq '^[[:space:]]*qt6-wayland$' ||
test/shell.d/upgrade-to-quattro-test.sh:33
- This failure message reads like an affirmative statement rather than describing the observed failure. Consider rewording to something like: “Omarchy 4 upgrade does not install qt6-wayland as an explicit core package” (or “Expected qt6-wayland in core_packages”). This makes CI failures faster to interpret.
fail "Omarchy 4 upgrade installs qt6-wayland as an explicit core package"
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 #7327.
qt6-waylandcould remain dependency-marked after upgrading an existing installation to Quattro. This caused it to appear inpacman -Qdtq, allowing orphan cleanup to remove the Wayland platform plugin required by Quickshell and Qt6 applications.This adds
qt6-waylandto the upgrade'score_packageslist. The existing installation andmark_packages_explicitsteps now ensure the package is explicitly installed, matching fresh-install behavior.A regression test verifies that
qt6-waylandremains in the explicitly marked core package set.Tested with:
bash test/shell.d/upgrade-to-quattro-test.shgit diff --check