diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-09-22 14:11:56 +0000 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2006-09-22 14:11:56 +0000 |
commit | 5c61582f8370adf9e02300dca4503112da9b4c12 (patch) | |
tree | 9795f891d91ac432ecd3114ab418f7a974b4d13d | |
parent | 5c25e770dbe071ded834d6297974a1d9c5d00c3b (diff) | |
download | quilt-5c61582f8370adf9e02300dca4503112da9b4c12.tar.gz |
- quilt/delete.in: Display the proper error message when using
"quilt delete" with no argument and no patch is applied.
- test/delete.test: Add a test for this specific case.
-rw-r--r-- | quilt.changes | 7 | ||||
-rw-r--r-- | quilt/delete.in | 3 | ||||
-rw-r--r-- | test/delete.test | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 256b358..abc398f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 22 16:09:55 CEST 2006 - khali@linux-fr.org + +- quilt/delete.in: Display the proper error message when using + "quilt delete" with no argument and no patch is applied. +- test/delete.test: Add a test for this specific case. + +------------------------------------------------------------------- Wed Sep 20 08:38:51 CEST 2006 - khali@linux-fr.org - po/ja.po: Update the Japanese translation, patch from diff --git a/quilt/delete.in b/quilt/delete.in index 4cb4364..240a43b 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -92,7 +92,8 @@ then fi if [ -z "$patch" ] then - printf $"No patches in series\n" >&2 + # find_top_patch will display the proper error message for us + find_top_patch > /dev/null exit 1 fi if is_applied "$patch"; then diff --git a/test/delete.test b/test/delete.test index 0ecf0f4..3b71fc0 100644 --- a/test/delete.test +++ b/test/delete.test @@ -94,6 +94,9 @@ Test the delete command. $ quilt series > %{P}test3 + $ quilt delete + > No patches applied + $ quilt delete test3 > Removed patch %{P}test3 |