From: Paolo Bonzini <pbonz...@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 <pbonz...@redhat.com>
Message-id: 1465224417-141321-2-git-send-email-pbonz...@redhat.com
Signed-off-by: Fam Zheng <f...@redhat.com>
---
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
