[Quilt-dev] Debian Bug#358875: quilt should fail if the series file references a non existent patch

[Martin Quinson]

Hello,

I got this from the Debian BTS. It sounds like a good idea to me, and the
patch sounds good also.

What do you guys think of it?

Mt.

----- Forwarded message from Nicolas François <address@hidden> -----

Subject: Bug#358875: quilt should fail if the series file references a non 
existent patch
X-Debian-PR-Package: quilt
Date: Fri, 24 Mar 2006 23:22:43 +0100
From: Nicolas François <address@hidden>
To: Debian Bug Tracking System <address@hidden>
User-Agent: Mutt/1.5.11+cvs20060126

Package: quilt
Version: 0.44-2
Severity: normal
Tags: patch

Hello,

When the series file references a non existent patch, it usually indicates
there is a problem, and quilt should fail.

This patch implements this and allows users to resume the push when they
specify the -f option.


Kind Regards,
-- 
Nekral

diff -rauN ../work2/quilt-0.44/quilt/push.in ./quilt-0.44/quilt/push.in
--- ../work2/quilt-0.44/quilt/push.in   2006-03-24 21:38:49.000000000 +0100
+++ ./quilt-0.44/quilt/push.in  2006-03-24 23:12:23.000000000 +0100
@@ -183,6 +183,13 @@
                no_reject_files="-r $tmp"
        fi
 
+       if ! [ -e $patch_file ] && [ -z "$opt_force" ]
+       then
+               printf $"Patch %s does not exist\n" \
+                      "$(print_patch $patch)"
+               exit 1
+       fi
+
        apply_patch $patch "$patch_file"
        status=$?
        trap "" SIGINT
@@ -206,6 +213,7 @@
 
                if ! [ -e $patch_file ]
                then
+                       # only if [ -n "$opt_force" ]
                        printf $"Patch %s does not exist; applied empty 
patch\n" \
                               "$(print_patch $patch)"
                elif [ -z "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" ]


----- End forwarded message -----

-- 
Thou shalt run lint frequently and study its pronouncements with care, for
verily its perception and judgement oft exceed thine.
  -- First commandment of the C programmer

signature.asc
Description: Digital signature