paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

install/upgrade: Allow new packages during apt-get upgrade.

Browse Source 
`postgresql-14.4` is a notable upgrade in the PostgreSQL series, as it
fixes potential database corruption from `CREATE INDEX CONCURRENTLY`
statements which are run while rows are modified[1].  However, it also
requires an upgrade from `libllvm9` to `libllvm10`, which means it is
not installed by a mere `apt-get upgrade`.

Add the `--with-new-pkgs` flag to all of the potentially relevant
`apt-get upgrade` calls, so that this (and similar) packages are
upgraded successfully.

[1]: https://www.postgresql.org/docs/release/14.4/
This commit is contained in:
Alex Vandiver
2022-06-20 14:29:19 -07:00
committed by Alex Vandiver
parent 95303a9929
commit a35af3f38b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/install
View File

@@ -452,7 +452,7 @@ fi
"$ZULIP_PATH"/scripts/zulip-puppet-apply -f "$ZULIP_PATH"/scripts/zulip-puppet-apply -f
if [ "$package_system" = apt ]; then if [ "$package_system" = apt ]; then
apt-get -y upgrade apt-get -y --with-new-pkgs upgrade
elif [ "$package_system" = yum ]; then elif [ "$package_system" = yum ]; then
# No action is required because `yum update` already does upgrade. # No action is required because `yum update` already does upgrade.
: :

4
scripts/lib/upgrade-zulip-stage-2
View File

@@ -228,7 +228,7 @@ if glob.glob("/usr/share/postgresql/*/extension/tsearch_extras.control"):
if not (minimal_change or args.skip_puppet): if not (minimal_change or args.skip_puppet):
logging.info("Upgrading system packages...") logging.info("Upgrading system packages...")
subprocess.check_call(["apt-get", "update"]) subprocess.check_call(["apt-get", "update"])
subprocess.check_call(["apt-get", "-y", "upgrade"]) subprocess.check_call(["apt-get", "-y", "--with-new-pkgs", "upgrade"])
# To bootstrap zulip-puppet-apply, we need to install the system yaml # To bootstrap zulip-puppet-apply, we need to install the system yaml
# package; new installs get this, but old installs may not have it. # package; new installs get this, but old installs may not have it.
@@ -444,7 +444,7 @@ else:
shutdown_server() shutdown_server()
logging.info("Applying Puppet changes...") logging.info("Applying Puppet changes...")
subprocess.check_call(["./scripts/zulip-puppet-apply", "--force"]) subprocess.check_call(["./scripts/zulip-puppet-apply", "--force"])
subprocess.check_call(["apt-get", "-y", "upgrade"]) subprocess.check_call(["apt-get", "-y", "--with-new-pkgs", "upgrade"])
# Puppet may have reloaded supervisor, and in so doing started # Puppet may have reloaded supervisor, and in so doing started
# services; mark as potentially needing to stop the server. # services; mark as potentially needing to stop the server.
IS_SERVER_UP = True IS_SERVER_UP = True

2
tools/setup/bootstrap-aws-installer
View File

@@ -36,7 +36,7 @@ export DEBIAN_FRONTEND=noninteractive
# Dependencies to install AWS CLI # Dependencies to install AWS CLI
( (
apt-get -qy update apt-get -qy update
apt-get -qy -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade apt-get -qy --with-new-pkgs -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade
apt-get -qy install jq unzip curl apt-get -qy install jq unzip curl
apt-get -qy autoclean apt-get -qy autoclean
) )