commit 749251e4b4e7948289bb3451264ab2abf7ecd7bb
author Mike Frysinger <vapier@chromium.org> Wed Jan 29 05:04:27 2014 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Jan 29 20:04:46 2014 +0000
tree d4cb848d60edc3205c08e404fd67bfbb9fe24121
parent 87e046484450f194daed375098fcf0a65f399ef1

cros_sdk: do not pass in bogus DEPOT_TOOLS

If there is no depot_tools in $PATH, we don't want to pass in the
string "None" as it'll mess up mounting and spew:
	mount: special device None does not exist

Re-add the None check that was dropped during the gerrit testing
merge in 9c13a67732096486d7fa37ed638e92f0c99a4721.

BUG=None
TEST=`cros_sdk` works w/depot_tools in PATH
TEST=`cros_sdk` works w/out depot_tools in PATH

Change-Id: Ie82d2c01b29d726358c16697e34e1d4b117d8386
Reviewed-on: https://chromium-review.googlesource.com/184340
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index ac23d44..eb57131 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -198,7 +198,10 @@
 
   # Pass in the path to the depot_tools so that users can access them from
   # within the chroot.
-  cmd += ['DEPOT_TOOLS=%s' % osutils.FindDepotTools()]
+  depot_tools = osutils.FindDepotTools()
+  if depot_tools:
+    cmd += ['DEPOT_TOOLS=%s' % depot_tools]
+
   return cmd