saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1088 from decomposite/preemptive_autounmask

Browse source 
Autounmask as separate step
This commit is contained in:
Nicole Thomas 2017-06-02 09:18:09 -06:00 • committed by GitHub
commit d361413541
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap-salt.sh
View file

@ -6143,11 +6143,15 @@ install_suse_check_services() {
#
# Gentoo Install Functions.
#
__autounmask() {
emerge --autounmask-write --autounmask-only "${@}"; return $?
}
__emerge() {
if [ "$_GENTOO_USE_BINHOST" -eq $BS_TRUE ]; then
emerge --autounmask-write --getbinpkg "${@}"; return $?
emerge --getbinpkg "${@}"; return $?
fi
emerge --autounmask-write "${@}"; return $?
emerge "${@}"; return $?
}
__gentoo_config_protection() {
@ -6185,15 +6189,20 @@ __gentoo_post_dep() {
__gentoo_config_protection
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
__autounmask 'dev-python/libcloud'
__emerge -v 'dev-python/libcloud'
fi
__autounmask 'dev-python/requests'
__autounmask 'app-admin/salt'
__emerge -vo 'dev-python/requests'
__emerge -vo 'app-admin/salt'
if [ "${_EXTRA_PACKAGES}" != "" ]; then
echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
# shellcheck disable=SC2086
__autounmask ${_EXTRA_PACKAGES} || return 1
__emerge -v ${_EXTRA_PACKAGES} || return 1
fi
}