From 095701d6c8c6bdcf5a1779d9006bc92da8003bb0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 9 Aug 2013 00:04:06 +0100 Subject: [PATCH] Fix unbound variable by creating a wrapper function for Gentoo's emerge. Fixes #201. --- bootstrap-salt.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 770b80e..0b428ef 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2602,11 +2602,11 @@ install_suse_11_restart_daemons() { # # Gentoo Install Functions. # -__gentoo_use_binhost() { +__emerge() { if [ $BS_GENTOO_USE_BINHOST -eq $BS_TRUE ]; then - return "--getbinpkg" + emerge --getbinpkg $@; return $? fi - return "" + emerge $@; return $? } __gentoo_set_ackeys() { @@ -2652,7 +2652,7 @@ __gentoo_post_dep() { # End of bootstrap-salt keywords. _EOT # the -o option asks it to emerge the deps but not the package. - emerge ${__gentoo_use_binhost} -vo salt + __emerge -vo salt } install_gentoo_deps() { @@ -2669,7 +2669,7 @@ install_gentoo_git_deps() { } install_gentoo_stable() { - emerge ${__gentoo_use_binhost} -v salt || return 1 + __emerge -v salt || return 1 } install_gentoo_git() {