From c003c045905ae068aae9b9a62662b20b1d14068a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 4 May 2012 14:36:01 +0100 Subject: buildhistory: fix multiple commit of images and packages at the same time The echo line here was merging multiple lines into one, and the result was that if both image and package changes had to be comitted then only the image changes were being committed and the package changes could potentially be merged into the next package change. Quoting the variable reference fixes this. Fixes [YOCTO #2411] (From OE-Core rev: 540cd9d42a4db562e5eca431cec89ac5a6a05cab) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 8d5b0963f8..d2d19ff9cd 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -402,7 +402,7 @@ buildhistory_commit() { git add ${BUILDHISTORY_DIR}/* HOSTNAME=`hostname 2>/dev/null || echo unknown` # porcelain output looks like "?? packages/foo/bar" - for entry in `echo $repostatus | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do + for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null done if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then -- cgit v1.2.3-54-g00ecf