Skip to content

fix(desktop-file): verify theme icons before rewriting icon #6374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soumyaDghosh wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix(desktop-file): verify theme icons before rewriting icon #6374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions snapcraft/parts/desktop_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ def _parse_and_reformat_section(
# If icon is just a name (no path separator), try to resolve it from the hicolor icon theme.
if "/" not in icon:
if (
icon_path := get_icon_from_theme(
theme_icon_path := get_icon_from_theme(
os.fspath(self._prime_dir), "hicolor", icon
)
Comment on lines 99 to 103
) is not None:
self._parser[section]["Icon"] = os.path.join("${SNAP}", icon_path)
icon = theme_icon_path
Comment on lines +101 to +105

# With everything stripped, check to see if the icon is there.
# if it is, add "${SNAP}" back and set the icon
Expand Down
Loading