From 34285b854a13fbb4b0863798d71f35e972306c96 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 24 Mar 2021 16:26:13 +0000 Subject: [PATCH] fix(arch): remove `python2-futures` package (moved to AUR) The `stable latest` build in the `salt-image-builder` started failing. * https://gitlab.com/myii/salt-image-builder/-/jobs/1124156923 ``` error: target not found: python2-futures core is up to date extra is up to date community is up to date * ERROR: Failed to run install_arch_linux_stable()!!! ``` The package has been moved to AUR: * https://aur.archlinux.org/packages/python2-futures/ * https://aur.archlinux.org/cgit/aur.git/commit/?h=python2-futures&id=06dea3ff2267d052dbc3779c9a93d31766769c6b - `import from community` The build is passing again with this workaround applied using `sed`: * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/83efb01cb8d12bfed121b003233afc7000300f06 * https://gitlab.com/myii/salt-image-builder/-/jobs/1124687557 --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index acee355..b4b3de1 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5633,7 +5633,7 @@ install_arch_linux_git_deps() { if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then pacman -R --noconfirm python2-distribute pacman -Su --noconfirm --needed python2-crypto python2-setuptools python2-jinja \ - python2-m2crypto python2-futures python2-markupsafe python2-msgpack python2-psutil \ + python2-m2crypto python2-markupsafe python2-msgpack python2-psutil \ python2-pyzmq zeromq python2-requests python2-systemd || return 1 if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then @@ -5675,7 +5675,7 @@ install_arch_linux_stable() { pacman -S --noconfirm --needed bash || return 1 pacman -Su --noconfirm || return 1 # We can now resume regular salt update - pacman -Syu --noconfirm salt python2-futures || return 1 + pacman -Syu --noconfirm salt || return 1 return 0 }