Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Unified Diff: sky/sdk/packages/sky/lib/sky_tool

Issue 1064983003: Fix sky_tool's calling of adb, and shelldb's analyze and stop (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/tools/shelldb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/packages/sky/lib/sky_tool
diff --git a/sky/sdk/packages/sky/lib/sky_tool b/sky/sdk/packages/sky/lib/sky_tool
index 7d0747083bdc6d980f8a600397f30e78dd1074b9..f7b8b6f116411740fe3bfbafc86d241f13019619 100755
--- a/sky/sdk/packages/sky/lib/sky_tool
+++ b/sky/sdk/packages/sky/lib/sky_tool
@@ -209,8 +209,19 @@ class StopSky(object):
class SkyShellRunner(object):
+ def _check_for_adb(self):
+ try:
+ subprocess.call([ADB_PATH, '--help'])
+ except OSError:
+ print "'adb' (from the Android SDK) not in $PATH, can't continue."
+ return False
+ return True
+
+
def main(self):
logging.basicConfig(level=logging.WARNING)
+ if not self._check_for_adb()
+ sys.exit(2)
parser = argparse.ArgumentParser(description='Sky Demo Runner')
subparsers = parser.add_subparsers(help='sub-command help')
« no previous file with comments | « no previous file | sky/tools/shelldb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698