From 91daacb8896e7969de089fbee104c6ac0e67210b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 24 Oct 2015 17:02:53 +0200 Subject: [PATCH] common: don't crash if an sdk binary is not found --- fdroidserver/common.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 547b0562..b668ef29 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1581,7 +1581,11 @@ def SdkToolsPopen(commands, cwd=None, output=True): cmd = commands[0] if cmd not in config: config[cmd] = find_sdk_tools_cmd(commands[0]) - return FDroidPopen([config[cmd]] + commands[1:], + abscmd = config[cmd] + if abscmd is None: + logging.critical("Could not find '%s' on your system" % cmd) + sys.exit(1) + return FDroidPopen(abscmd + commands[1:], cwd=cwd, output=output) -- 2.30.2