summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-05-21 13:16:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-23 07:56:10 +0100
commitf62255bfa6c5a322c867b7c4ea5686ea7bfab3fe (patch)
tree47a8eae420644434228cd59e4526eac2d21fac64
parent1964b697ddadc59e27087f9f1f6b24236f4addcc (diff)
downloadopenembedded-core-contrib-f62255bfa6c5a322c867b7c4ea5686ea7bfab3fe.tar.gz
openembedded-core-contrib-f62255bfa6c5a322c867b7c4ea5686ea7bfab3fe.tar.bz2
openembedded-core-contrib-f62255bfa6c5a322c867b7c4ea5686ea7bfab3fe.zip
classes/buildhistory: ensure that git user email and name are set
The git user.email and user.name settings must be set or the commit to the buildhistory repo (when BUILDHISTORY_COMMIT is set to "1") will fail. If the user hasn't set these, set some dummy values since the actual value is unlikely to be particularly useful and it's far worse for the commit not to be done leaving the repository in a partially set up state. Prompted by [YOCTO #6973]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/buildhistory.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 211dcf18b5..777aabc55d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -581,6 +581,15 @@ END
git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true
git tag -f build-minus-1 > /dev/null 2>&1 || true
fi
+ # If the user hasn't set up their name/email, set some defaults
+ # just for this repo (otherwise the commit will fail with older
+ # versions of git)
+ if ! git config user.email > /dev/null ; then
+ git config --local user.email "buildhistory@${DISTRO}"
+ fi
+ if ! git config user.name > /dev/null ; then
+ git config --local user.name "buildhistory"
+ fi
# Check if there are new/changed files to commit (other than metadata-revs)
repostatus=`git status --porcelain | grep -v " metadata-revs$"`
HOSTNAME=`hostname 2>/dev/null || echo unknown`