summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-27 10:53:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:14 +0100
commitf64d73f8c458b0bf1d3a585e92e1e37965af7aa1 (patch)
treec206bc6b2ec9f3e245c173d7b7fa5553b35fc4c7 /scripts
parentf1d3b5f1859f0bf411ed05e0695c813b3ed96305 (diff)
downloadast2050-yocto-poky-f64d73f8c458b0bf1d3a585e92e1e37965af7aa1.zip
ast2050-yocto-poky-f64d73f8c458b0bf1d3a585e92e1e37965af7aa1.tar.gz
devtool: update-recipe: check if source tree is a git repository
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. (From OE-Core master rev: eb2147aa8facd4ef33a0749e9ae660ec686dad48) (From OE-Core rev: c5dc3e819c1bb224e3cb667381faa5abf1888362) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 0142fe0..6b53781 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -470,13 +470,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
OpenPOWER on IntegriCloud