If you've done "devtool add" (or "devtool modify" without -x) then it's
possible that the external source tree is not a git repository, so we
should handle that case here instead of printing a traceback.
Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>
---
scripts/lib/devtool/standard.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index a642112..94b5e0b 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -477,13 +477,19 @@ def update_recipe(args, config, basepath, workspace):
return updated
srctree = workspace[args.recipename]
- if mode == 'srcrev':
+
+ # Get HEAD revision
+ try:
(stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree)
- srcrev = stdout.strip()
- if len(srcrev) != 40:
- logger.error('Invalid hash returned by git: %s' % stdout)
- return 1
+ except bb.process.ExecutionError as err:
+ print('Failed to get HEAD revision in %s: %s' % (srctree, err))
+ return 1
+ srcrev = stdout.strip()
+ if len(srcrev) != 40:
+ logger.error('Invalid hash returned by git: %s' % stdout)
+ return 1
+ if mode == 'srcrev':
logger.info('Updating SRCREV in recipe %s' %
os.path.basename(recipefile))
patchfields = {}
patchfields['SRCREV'] = srcrev
--
2.1.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
