From 7f902ac2fa6aa476483b1550566953c2ff6eaac9 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 16 Apr 2014 22:19:21 +0000 Subject: hash_get(): Still set value if not set to avoid getting __null --- src/share/poudriere/include/hash.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/share') diff --git a/src/share/poudriere/include/hash.sh b/src/share/poudriere/include/hash.sh index 5284bbbc..b8fd6c7c 100644 --- a/src/share/poudriere/include/hash.sh +++ b/src/share/poudriere/include/hash.sh @@ -34,6 +34,7 @@ hash_get() { local var="$2" local key="$3" local hash_var_name value + local ret _hash_var_name "${var}" "${key}" hash_var_name=${_hash_var_name} @@ -41,11 +42,16 @@ hash_get() { # Look value from cache eval "value=\${${hash_var_name}-__null}" - [ "${value}" = "__null" ] && return 1 + if [ "${value}" = "__null" ]; then + value= + ret=1 + else + ret=0 + fi - setvar "${var_return}" ${value} + setvar "${var_return}" "${value}" - return 0 + return ${ret} } hash_set() { -- cgit v1.2.3