diff options
| author | David Paleino <dapal@debian.org> | 2009-12-04 12:18:13 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2010-01-27 13:49:51 +0100 |
| commit | 57e4299143fc13997fcd998d658a1a569779b987 (patch) | |
| tree | e2748c598e9e52ad556f4e52a2583582071d0350 | |
| parent | 50b660843297b804bc189c21cf1daacaf5ebf212 (diff) | |
| download | quilt-57e4299143fc13997fcd998d658a1a569779b987.tar.gz | |
Give more meaningful error messages
Differentiate output when $QUILT_PATCHES/series is not found from
when $QUILT_PATCHES/series is empty.
This has originally been reported as
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557621
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 14 | ||||
| -rw-r--r-- | test/delete.test | 2 | ||||
| -rw-r--r-- | test/three.test | 18 |
4 files changed, 30 insertions, 12 deletions
diff --git a/quilt.changes b/quilt.changes index 65206a4..ac159e6 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 13:41:35 CET 2010 - dapal@debian.org + +- quilt/scripts/patchfns.in: Differentiate output when + $QUILT_PATCHES/series is not found from when + $QUILT_PATCHES/series is empty. +- test/*.test: Update accordingly. + +------------------------------------------------------------------- Wed Jan 27 13:40:10 CET 2010 - jdelvare@suse.de - configure.ac: Stop testing for cp -l. Bug reported by Olivier diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 2b3d515..fd6bb06 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -490,7 +490,12 @@ find_first_patch() local patch=$(cat_series | head -n 1) if [ -z "$patch" ] then - printf $"No patches in series\n" >&2 + if [ -e "$SERIES" ] + then + printf $"No patches in series\n" >&2 + else + printf $"No series file found\n" >&2 + fi return 1 fi @@ -502,7 +507,12 @@ find_last_patch() local patch=$(cat_series | tail -n 1) if [ -z "$patch" ] then - printf $"No patches in series\n" >&2 + if [ -e "$SERIES" ] + then + printf $"No patches in series\n" >&2 + else + printf $"No series file found\n" >&2 + fi return 1 fi diff --git a/test/delete.test b/test/delete.test index aa7ce88..3dfc584 100644 --- a/test/delete.test +++ b/test/delete.test @@ -3,7 +3,7 @@ Test the delete command. $ mkdir patches $ quilt delete - > No patches in series + > No series file found $ cat > test.txt < Calling pci_match_id() would be more feasible. diff --git a/test/three.test b/test/three.test index d35a402..91e5d22 100644 --- a/test/three.test +++ b/test/three.test @@ -2,31 +2,31 @@ $ touch e $ quilt annotate e - > No patches in series + > No series file found $ quilt top - > No patches in series + > No series file found $ quilt next - > No patches in series + > No series file found $ quilt previous - > No patches in series + > No series file found $ quilt unapplied - > No patches in series + > No series file found $ quilt applied - > No patches in series + > No series file found $ quilt next patch1 - > No patches in series + > No series file found $ quilt push patch1 - > No patches in series + > No series file found $ quilt push - > No patches in series + > No series file found $ quilt pop > No patch removed |