tags 557621 confirmed patch thanks Hello, I'm attaching a patch to fix this bug.
Kindly, David -- . ''`. 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
From a740b8ca5ef46b4363b51cc8429b7cf4e87774fd Mon Sep 17 00:00:00 2001 From: David Paleino <[email protected]> Date: Fri, 4 Dec 2009 10:01:08 +0100 Subject: [PATCH] debian/patches/add_meaningful_messages added (Closes: #557621) Differentiate messages between empty series and non-existent one. --- debian/changelog | 7 ++++- debian/patches/add_meaningful_messages | 51 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 58 insertions(+), 1 deletions(-) create mode 100644 debian/patches/add_meaningful_messages diff --git a/debian/changelog b/debian/changelog index 875a23b..3816c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ quilt (0.48-3) UNRELEASED; urgency=low + [ Raphaël Hertzog ] * Stop creating files with 000 mode in the .pc directory. Upstream has changed this in their git repository, so we can update our shell variant of backup-files accordingly. Closes: #557386, #534840 @@ -8,7 +9,11 @@ quilt (0.48-3) UNRELEASED; urgency=low * Support QUILT_PATCH_DIR input environment variable in CDBS's patchsys-quilt.mk. Closes: #517664 - -- Raphaël Hertzog <[email protected]> Thu, 26 Nov 2009 17:55:39 +0100 + [ David Paleino ] + * debian/patches/add_meaningful_messages added, differentiate messages + between empty series and non-existent one. (Closes: #557621) + + -- David Paleino <[email protected]> Fri, 04 Dec 2009 09:57:08 +0100 quilt (0.48-2) unstable; urgency=low diff --git a/debian/patches/add_meaningful_messages b/debian/patches/add_meaningful_messages new file mode 100644 index 0000000..934ac72 --- /dev/null +++ b/debian/patches/add_meaningful_messages @@ -0,0 +1,51 @@ +From: David Paleino <[email protected]> +Subject: differentiate messages between empty and non-existent series +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557621 +Forwarded: no + +--- + quilt/scripts/patchfns.in | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +--- quilt.orig/quilt/scripts/patchfns.in ++++ quilt/quilt/scripts/patchfns.in +@@ -480,10 +480,18 @@ remove_from_db() + + find_first_patch() + { ++ cat_series ++ local retval=$? ++ + local patch=$(cat_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 2 + fi + +@@ -492,10 +500,18 @@ find_first_patch() + + find_last_patch() + { ++ cat_series ++ local retval=$? ++ + local patch=$(cat_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 + diff --git a/debian/patches/series b/debian/patches/series index 1257990..9910890 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,3 +19,4 @@ create_db_on_snapshot unset_posix_strict_conformance_variables shell-subcommand use-sensible-editor +add_meaningful_messages -- 1.6.5.GIT
signature.asc
Description: This is a digitally signed message part.
