diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-05-14 16:35:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 10:56:48 +0100 |
commit | c5d7bd3ee98920281909452f8385dd441ab0ba8a (patch) | |
tree | 216d23b8b6789bedc3459b8cc671a81c16da0219 | |
parent | 472c86127ab57759588e5ec53c75ebb52667f094 (diff) | |
download | poky-c5d7bd3ee98920281909452f8385dd441ab0ba8a.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)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/sdk.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index f46577c2ab..4616753797 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") |