diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-01 17:44:34 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-08-17 04:55:49 -1000 |
| commit | 72bfdca08029c031cedc9dbbf366663632c1c8db (patch) | |
| tree | b2db5921e2a602c41cb2f50322976436cdd929fa /scripts | |
| parent | a7d406dce577192f98d76dbae411c72a8b7f07d4 (diff) | |
| download | openembedded-core-contrib-72bfdca08029c031cedc9dbbf366663632c1c8db.tar.gz | |
devtool/upgrade: catch bb.fetch2.decodeurl errors
Otherwise, workspace cleanup (removing bogus recipe and source tree)
will not happen, leaving breakage behind.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 74774f9b67580a8c56f605dfd4cc7b856bbeeae8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/upgrade.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index c57015eb40..39a1910a49 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -336,7 +336,10 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src replacing = True new_src_uri = [] for entry in src_uri: - scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(entry) + try: + scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(entry) + except bb.fetch2.MalformedUrl as e: + raise DevtoolError("Could not decode SRC_URI: {}".format(e)) if replacing and scheme in ['git', 'gitsm']: branch = params.get('branch', 'master') if rd.expand(branch) != srcbranch: |