From: Mark Wielaard <mark@klomp.org>
Date: Wed, 24 May 2017 15:59:53 +0000 (+0000)
Subject: Force removal of include/vgversion.h.tmp in make_or_upd_vgversion_h.
X-Git-Tag: svn/VALGRIND_3_13_0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a87904d3caa30fd6d6f6f3b84a605d5076d715d;p=thirdparty%2Fvalgrind.git

Force removal of include/vgversion.h.tmp in make_or_upd_vgversion_h.

When someone created a read only src dir and builds in a separate build
dir then the original read only vgversion.h is copied from the src dir
into the build dir as vgversion.h.tmp (also read only). It could then
not be removed again in the auxprogs/make_or_upd_vgversion_h script.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16418
---

diff --git a/auxprogs/make_or_upd_vgversion_h b/auxprogs/make_or_upd_vgversion_h
index cacbce3147..9a3bee3d96 100755
--- a/auxprogs/make_or_upd_vgversion_h
+++ b/auxprogs/make_or_upd_vgversion_h
@@ -37,7 +37,7 @@ then
     if grep -q unknown include/vgversion.h.tmp ||
        cmp -s include/vgversion.h include/vgversion.h.tmp
     then
-        rm include/vgversion.h.tmp
+        rm -f include/vgversion.h.tmp
     else
         mv include/vgversion.h.tmp include/vgversion.h
     fi