]> code.ossystems Code Review - openembedded-core.git/commitdiff
buildhistory: fix the check for existence of a git repo
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Wed, 27 Jan 2016 12:50:53 +0000 (14:50 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 29 Jan 2016 18:14:53 +0000 (18:14 +0000)
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 <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/buildhistory.bbclass

index 9f1744293a997cdea7a5430fa52362f4e5c1cdaf..3c4647ac7b0adb3dd89b66648fb05efa794830df 100644 (file)
@@ -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