Skip to contentSkip to conversation

Work around missing git user config in buildhistory

PATCH New Paul Eggleton 1 participant 2 messages May 21, 2015

lore
Share & tools
lore
#0 lore raw

cover Work around missing git user config in buildhistory

The following change since commit fe7780a9bbbfa4dcbbe457618a0842e91a3c6a0e:

libxdmcp: make libbsd usage deterministic (2015-05-21 10:48:41 +0100)

is available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-gituser
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-gituser

Paul Eggleton (1):
classes/buildhistory: ensure that git user email and name are set

 meta/classes/buildhistory.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 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].

---
 meta/classes/buildhistory.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/buildhistory.bbclass +9 -0
index 211dcf1..777aabc 100644
@@ -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`
Signature · 1 line
2.1.0