diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-05-04 14:36:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-04 16:44:58 +0100 |
commit | 3fd5d4db3b93bccf90b5914076df185d2ebbe371 (patch) | |
tree | 5ede4836461d08796c65c30150c6dfbc4557454e /meta/classes | |
parent | dfd0116a52b1a0d69b7125be5040ef424fc4fa88 (diff) | |
download | poky-3fd5d4db3b93bccf90b5914076df185d2ebbe371.tar.gz |
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: 2086bb86885951d0a74342e30ff205c24cb93f0d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
402 | git add ${BUILDHISTORY_DIR}/* | 402 | git add ${BUILDHISTORY_DIR}/* |
403 | HOSTNAME=`hostname 2>/dev/null || echo unknown` | 403 | HOSTNAME=`hostname 2>/dev/null || echo unknown` |
404 | # porcelain output looks like "?? packages/foo/bar" | 404 | # porcelain output looks like "?? packages/foo/bar" |
405 | for entry in `echo $repostatus | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do | 405 | for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do |
406 | git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null | 406 | git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null |
407 | done | 407 | done |
408 | if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then | 408 | if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then |