qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
	"Alexey Kardashevskiy" <aik@ozlabs.ru>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v3 2/5] build: don't create temporary files in source dir
Date: Fri,  3 Nov 2017 15:33:30 +0000	[thread overview]
Message-ID: <20171103153333.6416-3-berrange@redhat.com> (raw)
In-Reply-To: <20171103153333.6416-1-berrange@redhat.com>

There are cases where users do VPATH builds with the source directory being on
a read-only volume. In such a case they have to manually run the command
'git-submodule.sh ...modules...' ahead of time. When checking for status we
should not then write into the source dir.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 scripts/git-submodule.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 039f782d81..21909ea413 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -39,10 +39,9 @@ fi
 case "$command" in
 status)
     test -f "$substat" || exit 1
-    trap "rm -f ${substat}.tmp" EXIT
-    $GIT submodule status $modules > "${substat}.tmp"
-    test $? -ne 0 && error "failed to query git submodule status"
-    diff "${substat}" "${substat}.tmp" >/dev/null
+    CURSTATUS=`$GIT submodule status $modules`
+    OLDSTATUS=`cat $substat`
+    test "$CURSTATUS" = "$OLDSTATUS"
     exit $?
     ;;
 update)
-- 
2.13.6

  parent reply	other threads:[~2017-11-03 15:33 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-03 15:33 [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling Daniel P. Berrange
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 1/5] build: allow setting a custom GIT binary for transparent proxying Daniel P. Berrange
2017-11-03 18:27   ` Eric Blake
2017-11-03 15:33 ` Daniel P. Berrange [this message]
2017-11-03 18:28   ` [Qemu-devel] [PATCH v3 2/5] build: don't create temporary files in source dir Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 3/5] build: allow automatic git submodule updates to be disabled Daniel P. Berrange
2017-11-03 18:35   ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodule which does not exist Daniel P. Berrange
2017-11-03 18:36   ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list Daniel P. Berrange
2017-11-03 18:37   ` Eric Blake
2017-11-07  4:12   ` Alexey Kardashevskiy
2017-11-07  5:13     ` Alexey Kardashevskiy
2017-11-07 10:12       ` Daniel P. Berrange
2017-11-07 22:58         ` Alexey Kardashevskiy
2017-11-08  9:02           ` Daniel P. Berrange
2017-11-08  1:43         ` Alexey Kardashevskiy
2017-11-08  8:28         ` Alexey Kardashevskiy
2017-11-08  9:01           ` Daniel P. Berrange
2017-11-03 18:03 ` [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling Peter Maydell
2017-11-06 10:44   ` Daniel P. Berrange
2017-11-06 14:30     ` Daniel P. Berrange
2017-11-07  2:04       ` Alexey Kardashevskiy
2017-11-03 19:38 ` Philippe Mathieu-Daudé
2017-11-06  0:22 ` Alexey Kardashevskiy
2017-11-06  4:44   ` Alexey Kardashevskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171103153333.6416-3-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=aik@ozlabs.ru \
    --cc=eblake@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).