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
---
quilt/scripts/patchfns.in | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index 9ed4fd1..bfb689f 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -488,10 +488,19 @@ remove_from_db()
find_first_patch()
{
- local patch=$(cat_series | head -n 1)
+ local series retval patch
+ series=$(cat_series)
+ retval=$?
+ patch=$(echo $series | head -n 1)
+
if [ -z "$patch" ]
then
- printf $"No patches in series\n" >&2
+ if [ $retval -eq 1 ]
+ then
+ printf $"No series file found\n" >&2
+ else
+ printf $"No patches in series\n" >&2
+ fi
return 1
fi
@@ -500,10 +509,19 @@ find_first_patch()
find_last_patch()
{
- local patch=$(cat_series | tail -n 1)
+ local series retval patch
+ series=$(cat_series)
+ retval=$?
+ patch=$(echo $series | tail -n 1)
+
if [ -z "$patch" ]
then
- printf $"No patches in series\n" >&2
+ if [ $retval -eq 1 ]
+ then
+ printf $"No series file found\n" >&2
+ else
+ printf $"No patches in series\n" >&2
+ fi
return 1
fi
--
. ''`. Debian developer | http://wiki.debian.org/DavidPaleino
: :' : Linuxer #334216 --|-- http://www.hanskalabs.net/
`. `'` GPG: 1392B174 ----|---- http://snipr.com/qa_page
`- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
