From: Alexander Kanavin Date: Wed, 2 Aug 2023 07:24:35 +0000 (+0200) Subject: devtool/upgrade: raise an error if extracting source produces more than one directory X-Git-Tag: uninative-4.1~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b25e922b271794906b22450c7e6cc18fcab51ff8;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git devtool/upgrade: raise an error if extracting source produces more than one directory This can happen if running unpack task produces unrelated files and directories (e.g. if recipe_qa or other tasks run); in this case it's better to stop, rather than allow devtool to continue and error out much later with a message that has nothing to do with where the problem originated. The idea here was to handle tarballs that don't contain a top level directory and thus the source tree is one level up; this basically never happens, and if it does we should find a less brittle way to handle such tarballs. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 6c4a62b5584..e015a85982c 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -35,6 +35,8 @@ def _get_srctree(tmpdir): dirs = scriptutils.filter_src_subdirs(tmpdir) if len(dirs) == 1: srctree = os.path.join(tmpdir, dirs[0]) + else: + raise DevtoolError("Cannot determine where the source tree is after unpacking in {}: {}".format(tmpdir,dirs)) return srctree def _copy_source_code(orig, dest):