diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 0142fe0d62..6b5378176e 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -470,13 +470,19 @@ def update_recipe(args, config, basepath, workspace): | |||
470 | return updated | 470 | return updated |
471 | 471 | ||
472 | srctree = workspace[args.recipename] | 472 | srctree = workspace[args.recipename] |
473 | if mode == 'srcrev': | 473 | |
474 | # Get HEAD revision | ||
475 | try: | ||
474 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) | 476 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) |
475 | srcrev = stdout.strip() | 477 | except bb.process.ExecutionError as err: |
476 | if len(srcrev) != 40: | 478 | print('Failed to get HEAD revision in %s: %s' % (srctree, err)) |
477 | logger.error('Invalid hash returned by git: %s' % stdout) | 479 | return 1 |
478 | return 1 | 480 | srcrev = stdout.strip() |
481 | if len(srcrev) != 40: | ||
482 | logger.error('Invalid hash returned by git: %s' % stdout) | ||
483 | return 1 | ||
479 | 484 | ||
485 | if mode == 'srcrev': | ||
480 | logger.info('Updating SRCREV in recipe %s' % os.path.basename(recipefile)) | 486 | logger.info('Updating SRCREV in recipe %s' % os.path.basename(recipefile)) |
481 | patchfields = {} | 487 | patchfields = {} |
482 | patchfields['SRCREV'] = srcrev | 488 | patchfields['SRCREV'] = srcrev |