]> git.neil.brown.name Git - wiggle.git/commitdiff
Fix up problem with make_diff
authorNeil Brown <neilb@suse.de>
Tue, 13 Jun 2006 12:57:04 +0000 (22:57 +1000)
committerNeil Brown <neilb@suse.de>
Tue, 13 Jun 2006 12:57:04 +0000 (22:57 +1000)
Because creation of .patches/patch is now delayed,
we couldn't delete it when needed.

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

diff --git a/p b/p
index 5af652b7fd63da4d6db3e8fda5cd5ca7d789653f..0b2f701997ef08cda533788cf5a3de1427121722 100755 (executable)
--- 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()