From: Neil Brown <neilb@suse.de>
Date: Tue, 13 Jun 2006 12:57:04 +0000 (+1000)
Subject: Fix up problem with make_diff
X-Git-Tag: v0.7~15
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=4f8f70b37ffefdd82293854ba92c684077e27a16;p=wiggle.git

Fix up problem with make_diff

Because creation of .patches/patch is now delayed,
we couldn't delete it when needed.

Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/p b/p
index 5af652b..0b2f701 100755
--- a/p
+++ b/p
@@ -241,7 +241,7 @@ make_diff()
 {
 	get_conf tagline
 	upgrade_one "$1"
-   {
+   { {
 	[ -s .patches/status ] && echo "Status: `cat .patches/status`"
 	[ -s .patches/notes ] && { echo; cat .patches/notes ; }
 	if [ -z "$tagline" ] || grep -F "$tagline" .patches/notes > /dev/null 2>&1
@@ -255,7 +255,7 @@ make_diff()
 	cat .patches/tmp
 	[ -s .patches/tmp ] || rm .patches/patch
 	rm .patches/tmp
-   } | sed 's,^--- ./.patches/current/,--- .prev/,' > .patches/patch
+   } | sed 's,^--- ./.patches/current/,--- .prev/,' ; } > .patches/patch
 }
 
 save_patch()