Skip to content
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

snapd: bugfix: Fix formatting error and change to critical #4668

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

snapd: bugfix: Fix formatting error and change to critical #4668

Show file tree
Hide file tree
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
11 changes: 7 additions & 4 deletions packages/s/snapd/files/wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,18 @@ fi

if [[ "${CONFINEMENT}" != "strict" ]] && [[ "${DISABLE_CONFINEMENT_WARNING:-n}" != "y" ]]
then
if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]
# This prevents the warning from showing on KDE Plasma
# if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]

Comment on lines +32 to +34
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just remove this entirely if it doesn't work.

Suggested change
# This prevents the warning from showing on KDE Plasma
# if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]] && [[ -n "${GIO_LAUNCHED_DESKTOP_FILE+x}" ]]

if [[ -n "${BAMF_DESKTOP_FILE_HINT+x}" ]]
then
notify-send \
--app-name Snap \
--urgency normal \
--urgency critical \
--icon dialog-warning \
"Snap has ${CONFINEMENT} confinement" \
"Snaps will stop working in early January 2025." \
"See ${URL} for details."
"Snaps will stop working in early January 2025. For details see<br> \
${URL}"
Comment on lines +42 to +43
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't work for me:

image

It also overflows the regular notification:

image

Maybe trim it down so at least help.getsol.us is visible:

Suggested change
"Snaps will stop working in early January 2025. For details see<br> \
${URL}"
"Snaps will stop working in early January 2025. See ${URL}"

else
echo -e "${YELLOW}WARNING:${NC} snap is running with ${CONFINEMENT} confinement." \
"Snaps will stop working in early January 2025." \
Expand Down
2 changes: 1 addition & 1 deletion packages/s/snapd/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name : snapd

Check warning on line 1 in packages/s/snapd/package.yml

View workflow job for this annotation

GitHub Actions / Checks 

`monitoring.yml` is missing
version : 2.63
homepage : https://snapcraft.io/
release : 83
release : 84
source :
- https://github.com/snapcore/snapd/releases/download/2.63/snapd_2.63.vendor.tar.xz : 2f0083d2c4e087c29f48cd1abb8a92eb2e63cf04cd433256c86fac05d0b28cab
license : GPL-3.0-only
Expand Down
12 changes: 6 additions & 6 deletions packages/s/snapd/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>snapd</Name>
<Homepage>https://snapcraft.io/</Homepage>
<Packager>
<Name>David Harder</Name>
<Email>[email protected]</Email>
<Name>Tracey Clark</Name>
<Email>[email protected]</Email>
</Packager>
<License>GPL-3.0-only</License>
<PartOf>desktop</PartOf>
Expand Down Expand Up @@ -77,12 +77,12 @@
</Files>
</Package>
<History>
<Update release="83">
<Date>2024-12-20</Date>
<Update release="84">
<Date>2024-12-24</Date>
<Version>2.63</Version>
<Comment>Packaging update</Comment>
<Name>David Harder</Name>
<Email>[email protected]</Email>
<Name>Tracey Clark</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>
Loading