mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Only upgrade pacakges, don't reinstall unless newwer.
This commit is contained in:
parent
14dd68a2e9
commit
96a9df7d8a
1 changed files with 5 additions and 5 deletions
|
@ -2250,10 +2250,10 @@ _eof
|
||||||
install_arch_linux_git_deps() {
|
install_arch_linux_git_deps() {
|
||||||
install_arch_linux_stable_deps
|
install_arch_linux_stable_deps
|
||||||
|
|
||||||
pacman -Sy --noconfirm pacman || return 1
|
pacman -Sy --noconfirm --needed pacman || return 1
|
||||||
# Don't fail if un-installing python2-distribute threw an error
|
# Don't fail if un-installing python2-distribute threw an error
|
||||||
pacman -R --noconfirm python2-distribute
|
pacman -R --noconfirm --needed python2-distribute
|
||||||
pacman -Sy --noconfirm git python2-crypto python2-setuptools \
|
pacman -Sy --noconfirm --needed git python2-crypto python2-setuptools \
|
||||||
python2-jinja python2-m2crypto python2-markupsafe python2-msgpack \
|
python2-jinja python2-m2crypto python2-markupsafe python2-msgpack \
|
||||||
python2-psutil python2-yaml python2-pyzmq zeromq || return 1
|
python2-psutil python2-yaml python2-pyzmq zeromq || return 1
|
||||||
|
|
||||||
|
@ -2269,11 +2269,11 @@ install_arch_linux_git_deps() {
|
||||||
}
|
}
|
||||||
|
|
||||||
install_arch_linux_stable() {
|
install_arch_linux_stable() {
|
||||||
pacman -Sy --noconfirm pacman || return 1
|
pacman -Sy --noconfirm --needed pacman || return 1
|
||||||
# See https://mailman.archlinux.org/pipermail/arch-dev-public/2013-June/025043.html
|
# See https://mailman.archlinux.org/pipermail/arch-dev-public/2013-June/025043.html
|
||||||
# to know why we're ignoring below.
|
# to know why we're ignoring below.
|
||||||
pacman -Syu --noconfirm --ignore filesystem,bash || return 1
|
pacman -Syu --noconfirm --ignore filesystem,bash || return 1
|
||||||
pacman -S --noconfirm bash || return 1
|
pacman -S --noconfirm --needed bash || return 1
|
||||||
pacman -Su --noconfirm || return 1
|
pacman -Su --noconfirm || return 1
|
||||||
# We can now resume regular salt update
|
# We can now resume regular salt update
|
||||||
pacman -Syu --noconfirm salt || return 1
|
pacman -Syu --noconfirm salt || return 1
|
||||||
|
|
Loading…
Add table
Reference in a new issue