mirror of https://github.com/zulip/zulip.git
apt-repos: Temporarily work around Ubuntu 24.04 non-installable gnupg.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
9c055df695
commit
4ebc734632
|
@ -86,6 +86,12 @@ fi
|
||||||
# Hash to check if the configuration is changed by the script later.
|
# Hash to check if the configuration is changed by the script later.
|
||||||
hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true)
|
hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true)
|
||||||
|
|
||||||
|
if [ -e "$LIST_PATH/$LIST.pref" ]; then
|
||||||
|
cp "$LIST_PATH/$LIST.pref" "$PREF_FILE"
|
||||||
|
else
|
||||||
|
rm -f "$PREF_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
pre_setup_deps=(apt-transport-https ca-certificates gnupg curl)
|
pre_setup_deps=(apt-transport-https ca-certificates gnupg curl)
|
||||||
if ! apt-get -dy install "${pre_setup_deps[@]}"; then
|
if ! apt-get -dy install "${pre_setup_deps[@]}"; then
|
||||||
apt-get update
|
apt-get update
|
||||||
|
@ -95,12 +101,6 @@ apt-get -y install "${pre_setup_deps[@]}"
|
||||||
apt-key add "$LIST_PATH/"*.asc
|
apt-key add "$LIST_PATH/"*.asc
|
||||||
cp "$LIST_PATH/$release.list" "$SOURCES_FILE"
|
cp "$LIST_PATH/$release.list" "$SOURCES_FILE"
|
||||||
|
|
||||||
if [ -e "$LIST_PATH/$LIST.pref" ]; then
|
|
||||||
cp "$LIST_PATH/$LIST.pref" "$PREF_FILE"
|
|
||||||
else
|
|
||||||
rm -f "$PREF_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "$LIST_PATH/custom.sh" ]; then
|
if [ -e "$LIST_PATH/custom.sh" ]; then
|
||||||
export LIST_PATH
|
export LIST_PATH
|
||||||
export STAMP_FILE
|
export STAMP_FILE
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Temporary workaround for
|
||||||
|
# https://discourse.ubuntu.com/t/whats-happening-in-noble-repositories/43729/7
|
||||||
|
Package: gnupg
|
||||||
|
Pin: version 2.4.4-2ubuntu7
|
||||||
|
Pin-Priority: 501
|
||||||
|
|
||||||
|
Package: nginx-common nginx-full
|
||||||
|
Pin: version 1.24.0-2ubuntu4
|
||||||
|
Pin-Priority: 501
|
Loading…
Reference in New Issue