From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vo8-0007kU-Ik for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:47:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9vny-0000Aa-Ii for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:47:11 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vny-0000AT-BU for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:47:02 -0400 Received: by mail-wm0-x244.google.com with SMTP id k184so10686634wme.2 for ; Mon, 06 Jun 2016 07:47:02 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:52 +0200 Message-Id: <1465224417-141321-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1465224417-141321-1-git-send-email-pbonzini@redhat.com> References: <1465224417-141321-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 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: famz@redhat.com 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 --- 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 2fd2ca3..d0ad36c 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.$$$$) -- 1.8.3.1