Commit d2a253b3 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/bugfix/10889-dot-key-file-association' into devel

Fix-committed: #10889
parents 6a712dca 318bb808
......@@ -10,7 +10,10 @@ if grep -E '^application/pgp-keys=' "$defaults_file"; then
echo "application/pgp-keys is already configured in $defaults_file" >&2
exit 1
else
# XXX: Stretch -- this fixes Tails#10571, unreproducible on non-Tails sid
# XXX: Stretch -- this fixes https://bugs.freedesktop.org/show_bug.cgi?id=93656
# (Tails#10889, Tails#10571)
echo 'application/pgp-keys=seahorse-pgp-keys.desktop' \
>> "$defaults_file"
echo 'application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop' \
>> "$defaults_file"
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment