diff options
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/pop.in | 2 | ||||
| -rw-r--r-- | quilt/push.in | 2 | ||||
| -rw-r--r-- | scripts/patchfns.in | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/quilt.changes b/quilt.changes index 5258496..af6d741 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 10 10:46:56 CET 2004 - agruen@suse.de + +- Quilt push/pop: exit with a non-zero status when beyond series. +- Ignore empty lines in series file. + +------------------------------------------------------------------- Tue Mar 9 02:00:14 CET 2004 - agruen@suse.de - Make files writeable in `quilt add' (and `quilt edit') for diff --git a/quilt/pop.in b/quilt/pop.in index 0a08f89..fdc10dd 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -155,7 +155,7 @@ then elif [ -z "$patches" ] then echo $"No patch removed" - exit 0 + exit 1 fi trap "interrupted=1" SIGINT diff --git a/quilt/push.in b/quilt/push.in index 4202f59..87b9678 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -186,7 +186,7 @@ Please pop -f the top patch and check your series file." else echo $"File series fully applied, ends at patch $top" fi - exit 0 + exit 1 fi trap "interrupted=1" SIGINT diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 9b37e47..38d08a9 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -281,8 +281,8 @@ cat_series() { if [ -e $SERIES ] then - @SED@ -e '/^#/d' -e 's/^[ '$'\t'']*//' -e 's/[ '$'\t''].*//' \ - $SERIES + @SED@ -e '/^$/d' -e '/^#/d' -e 's/^[ '$'\t'']*//' \ + -e 's/[ '$'\t''].*//' $SERIES else return 1 fi |