From 785518d6e6f7190350fb858867684d2f70d4671a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 1 Feb 2017 09:56:14 +1300 Subject: devtool: improve parse failure handling With the move to tinfoil2, the behaviour when parsing failed has changed a bit - exceptions are now raised, so handle these appropriately. Specifically when if parsing the recipe created when running devtool add fails, rename it to .bb.parsefailed so that the user can run bitbake afterwards without parsing being interrupted. Signed-off-by: Paul Eggleton --- scripts/create-pull-request | 1 + scripts/lib/devtool/__init__.py | 7 ++++++- scripts/lib/devtool/standard.py | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index e82858bc98..7c6b96d5c4 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -183,6 +183,7 @@ if [ -n "$WEB_URL" ]; then git push $REMOTE $L_BRANCH:$BRANCH echo "" fi + echo $WEB_URL wget --no-check-certificate -q $WEB_URL -O /dev/null if [ $? -ne 0 ]; then echo "WARNING: Branch '$BRANCH' was not found on the contrib git tree." diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index fd2f042ba5..91111e1109 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -135,7 +135,12 @@ def parse_recipe(config, tinfoil, pn, appends, filter_workspace=True): not path.startswith(config.workspace_path)] else: append_files = None - return tinfoil.parse_recipe_file(recipefile, appends, append_files) + try: + rd = tinfoil.parse_recipe_file(recipefile, appends, append_files) + except Exception as e: + logger.error(str(e)) + return None + return rd def check_workspace_recipe(workspace, pn, checksrc=True, bbclassextend=False): """ diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 30b247fa74..5bd498c933 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -224,8 +224,17 @@ def add(args, config, basepath, workspace): tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: - rd = tinfoil.parse_recipe_file(recipefile, False) + try: + rd = tinfoil.parse_recipe_file(recipefile, False) + except Exception as e: + logger.error(str(e)) + rd = None if not rd: + # Parsing failed. We just created this recipe and we shouldn't + # leave it in the workdir or it'll prevent bitbake from starting + movefn = '%s.parsefailed' % recipefile + logger.error('Parsing newly created recipe failed, moving recipe to %s for reference. If this looks to be caused by the recipe itself, please report this error.' % movefn) + shutil.move(recipefile, movefn) return 1 if args.fetchuri and not args.no_git: -- cgit 1.2.3-korg