Author: dteske
Date: Fri Mar  7 20:18:39 2014
New Revision: 262898
URL: http://svnweb.freebsd.org/changeset/base/262898

Log:
  Fix incorrect return status if var_to_set and var_to_get are the same.

Modified:
  head/usr.sbin/bsdconfig/share/common.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr   Fri Mar  7 20:15:52 2014        
(r262897)
+++ head/usr.sbin/bsdconfig/share/common.subr   Fri Mar  7 20:18:39 2014        
(r262898)
@@ -270,9 +270,9 @@ f_getvar()
 {
        local __var_to_get="$1" __var_to_set="$2"
        [ "$__var_to_set" ] || local value
-       eval ${__var_to_set:-value}=\"\${$__var_to_get}\"
        eval [ \"\${$__var_to_get+set}\" ]
        local __retval=$?
+       eval ${__var_to_set:-value}=\"\${$__var_to_get}\"
        eval f_dprintf '"f_getvar: var=[%s] value=[%s] r=%u"' \
                \"\$__var_to_get\" \"\$${__var_to_set:-value}\" \$__retval
        [ "$__var_to_set" ] || { [ "$value" ] && echo "$value"; }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to