From f0cb397a9e204c86be7730f94ae5fba84d88f89a Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 4 Mar 2016 13:56:23 -0800
Subject: [PATCH] Small fixes.

Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
---
 envsetup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 2aac383b5..deb6e92b9 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -60,8 +60,8 @@ function build_build_var_cache()
     fi
     # Excute the script to store the "<val>=<value>" pairs as shell variables.
     eval "$build_dicts_script"
-    unset build_dicts_script
     ret=$?
+    unset build_dicts_script
     if [ $ret -ne 0 ]
     then
         return $ret
@@ -69,7 +69,7 @@ function build_build_var_cache()
     BUILD_VAR_CACHE_READY="true"
 }
 
-# Delete the build cache, so that we can still call into the build system
+# Delete the build var cache, so that we can still call into the build system
 # to get build variables not listed in this script.
 function destroy_build_var_cache()
 {