summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-05-14 08:35:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:22:46 (GMT)
commit3259b70497355a009a2ce8159e4f851278e704a1 (patch)
tree238c8a0a2f8774192df0147d2de7220499a2d8f0
parentb332766553a4adc1516518ce083fa64456fc2c01 (diff)
downloadpoky-3259b70497355a009a2ce8159e4f851278e704a1.tar.gz
devtool/sdk.py: error out in case of downloading file failure
It's possible that downloading file from updateserver fails. In this case, we should error out instead of continue. We have users reporting unexpected behavior of 'devtool sdk-update'. When an invalid url is supplied, e.g., `devtool sdk-update http://invalid', the program reports 'Note: Already up-to-date'. This is obviously not expected. We should error out in such case. (From OE-Core rev: 449564783dfb162536a2f772b3a8704973221e0f) (From OE-Core rev: 4b022a62998e38dbefe1f882bcb9a229485ac9da) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/sdk.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
index f46577c..4616753 100644
--- a/scripts/lib/devtool/sdk.py
+++ b/scripts/lib/devtool/sdk.py
@@ -145,6 +145,9 @@ def sdk_update(args, config, basepath, workspace):
145 # Fetch manifest from server 145 # Fetch manifest from server
146 tmpmanifest = os.path.join(tmpsdk_dir, 'conf', 'sdk-conf-manifest') 146 tmpmanifest = os.path.join(tmpsdk_dir, 'conf', 'sdk-conf-manifest')
147 ret = subprocess.call("wget -q -O %s %s/conf/sdk-conf-manifest" % (tmpmanifest, updateserver), shell=True) 147 ret = subprocess.call("wget -q -O %s %s/conf/sdk-conf-manifest" % (tmpmanifest, updateserver), shell=True)
148 if ret != 0:
149 logger.error("Cannot dowload files from %s" % updateserver)
150 return ret
148 changedfiles = check_manifest(tmpmanifest, basepath) 151 changedfiles = check_manifest(tmpmanifest, basepath)
149 if not changedfiles: 152 if not changedfiles:
150 logger.info("Already up-to-date") 153 logger.info("Already up-to-date")