From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAXpA-0004ZW-Af for qemu-devel@nongnu.org; Wed, 08 Jun 2016 03:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAXp3-0005tl-7Z for qemu-devel@nongnu.org; Wed, 08 Jun 2016 03:22:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAXp3-0005tg-1T for qemu-devel@nongnu.org; Wed, 08 Jun 2016 03:22:41 -0400 From: Fam Zheng Date: Wed, 8 Jun 2016 15:22:20 +0800 Message-Id: <20160608072225.26745-2-famz@redhat.com> In-Reply-To: <20160608072225.26745-1-famz@redhat.com> References: <20160608072225.26745-1-famz@redhat.com> Subject: [Qemu-devel] [PULL 1/6] tests/docker: fix make-archive-maybe List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org From: Paolo Bonzini make-archive-maybe expects an archive path relative to $1, but receives a path relative to the current directory. Redirect the output outside the subshell to bypass the "cd $1". Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-2-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 134dc6f..f88c0a7 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -21,10 +21,10 @@ IMAGES ?= % make-archive-maybe = $(if $(wildcard $1/*), \ $(call quiet-command, \ (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \ - git archive -1 HEAD --format=tar.gz -o $2; \ + git archive -1 HEAD --format=tar.gz; \ else \ - git archive -1 $$(git stash create) --format=tar.gz -o $2; \ - fi), \ + git archive -1 $$(git stash create) --format=tar.gz; \ + fi) > $2, \ " ARCHIVE $(notdir $2)")) CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) -- 2.8.3