summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul <paul@peggleto-mobl.ger.corp.intel.com>2017-08-28 17:22:13 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-31 11:50:26 +1200
commitb13dbb2dbe5e7582386cef8450529134075c1aa7 (patch)
tree65894c545159697209f01047303ac0e0f83b0062
parent2b2a271a3fb1f07b048c2a76fb065ecd69bb31d1 (diff)
downloadopenembedded-core-contrib-b13dbb2dbe5e7582386cef8450529134075c1aa7.tar.gz
openembedded-core-contrib-b13dbb2dbe5e7582386cef8450529134075c1aa7.tar.bz2
openembedded-core-contrib-b13dbb2dbe5e7582386cef8450529134075c1aa7.zip
devtool: upgrade: check that user has configured git properly
If user.name or user.email haven't been set then git rebase can't really work properly. Check that the user has set these and error out if not. (Elsewhere we are relying on OE's git patch functionality which forces a dummy OE value - that's OK there as it's completely under OE's control and therefore it's OK for a dummy OE user to be the committer, but here the rebase may require intervention so it's reasonable to have the user's actual name and email on the operation.) Fixes [YOCTO #11947]. Signed-off-by: paul <paul@peggleto-mobl.ger.corp.intel.com>
-rw-r--r--scripts/lib/devtool/upgrade.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 24937dcd20..e334d2b6f8 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -1,6 +1,6 @@
# Development tool - upgrade command plugin
#
-# Copyright (C) 2014-2015 Intel Corporation
+# Copyright (C) 2014-2017 Intel Corporation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@@ -355,6 +355,29 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil
return fullpath, copied
+
+def _check_git_config():
+ def getconfig(name):
+ try:
+ value = bb.process.run('git config --global %s' % name)[0].strip()
+ except bb.process.ExecutionError as e:
+ if e.exitcode == 1:
+ value = None
+ else:
+ raise
+ return value
+
+ username = getconfig('user.name')
+ useremail = getconfig('user.email')
+ configerr = []
+ if not username:
+ configerr.append('Please set your name using:\n git config --global user.name')
+ if not useremail:
+ configerr.append('Please set your email using:\n git config --global user.email')
+ if configerr:
+ raise DevtoolError('Your git configuration is incomplete which will prevent rebases from working:\n' + '\n'.join(configerr))
+
+
def upgrade(args, config, basepath, workspace):
"""Entry point for the devtool 'upgrade' subcommand"""
@@ -365,6 +388,8 @@ def upgrade(args, config, basepath, workspace):
if args.srcbranch and not args.srcrev:
raise DevtoolError("If you specify --srcbranch/-B then you must use --srcrev/-S to specify the revision" % args.recipename)
+ _check_git_config()
+
tinfoil = setup_tinfoil(basepath=basepath, tracking=True)
try:
rd = parse_recipe(config, tinfoil, args.recipename, True)