From 9aa80dc4574ccd3b04d598c0727ab5b135d5416c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Tue, 18 Oct 2011 13:52:19 -0400
Subject: [PATCH] cros_sdk: always pull shflags from local tree

Since we need this anyways (can't assume the host outside of the chroot
provides shflags), always source the local copy rather than searching
for versions provided by the chroot.

BUG=chromium-os:21742
TEST=`cros_sdk --enter` works
TEST=`./build_packages --board=amd64-generic` works
Change-Id: Ia390042131f59948472b124cfe4e273483eada6a
Reviewed-on: http://gerrit.chromium.org/gerrit/10231
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
---
 common.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/common.sh b/common.sh
index 826dc6f615..f2066ac72b 100644
--- a/common.sh
+++ b/common.sh
@@ -112,13 +112,7 @@ if [ -f "$CHROMEOS_DEV_SETTINGS" ]; then
 fi
 
 # Load shflags
-if [[ -f /usr/lib/shflags ]]; then
-  . /usr/lib/shflags
-elif [ -f ./lib/shflags/shflags ]; then
-  . ./lib/shflags/shflags
-else
-  . "${SRC_ROOT}/scripts/lib/shflags/shflags"
-fi
+. "${SCRIPTS_DIR}"/lib/shflags/shflags || exit 1
 
 # Our local mirror
 DEFAULT_CHROMEOS_SERVER=${CHROMEOS_SERVER:-"http://build.chromium.org/mirror"}