From: Markus Lehtonen Date: Wed, 27 Jan 2016 12:50:53 +0000 (+0200) Subject: buildhistory: fix the check for existence of a git repo X-Git-Tag: 2016-4~1208 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a5e931e0b1d941cc938fe2f49625c54b07fab0ce;p=openembedded-core.git buildhistory: fix the check for existence of a git repo Previously, in order to determine the existence of an already initialized Git repository we checked if a directory named '.git' was present in the buildhistory dir. However, e.g. in the case of git submodules '.git' may also be a regular file referencing some other location which was causing unwanted behavior. This patch changes buildhistory.bbclass to check for any file named '.git' which fixes these problems. [YOCTO #8911] Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 9f1744293a..3c4647ac7b 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -684,7 +684,7 @@ END ( cd ${BUILDHISTORY_DIR}/ # Initialise the repo if necessary - if [ ! -d .git ] ; then + if [ ! -e .git ] ; then git init -q else git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true