summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2008-06-24 07:34:08 +0000
committerAndreas Gruenbacher <agruen@suse.de>2008-06-24 07:34:08 +0000
commitc91457ed0564a5aec523a657e9bc0e3d47e1c36d (patch)
tree5aa173c9718c83695af77f4ee0c48dc421c9287f
parentb634242a6a11012e45660e6579a0299cf1271ece (diff)
downloadquilt-c91457ed0564a5aec523a657e9bc0e3d47e1c36d.tar.gz
- quilt/scripts/patchfns.in (cat_series): Handle lines properly
that only contain whitespace.
-rw-r--r--quilt.changes6
-rw-r--r--quilt/scripts/patchfns.in4
2 files changed, 8 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes
index 4b59efb..9c9015a 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jun 24 09:32:29 CEST 2008 - agruen@suse.de
+
+- quilt/scripts/patchfns.in (cat_series): Handle lines properly
+ that only contain whitespace.
+
+-------------------------------------------------------------------
Fri Jun 13 11:50:30 CEST 2008 - agruen@suse.de
- quilt/import.in: When importing multiple patches at once, make
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index e299aa1..89a9697 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -346,8 +346,8 @@ cat_series()
{
if [ -e $SERIES ]
then
- sed -e '/^$/d' -e '/^#/d' -e 's/^[ '$'\t'']*//' \
- -e 's/[ '$'\t''].*//' $SERIES
+ sed -e '/^#/d' -e 's/^[ '$'\t'']*//' \
+ -e 's/[ '$'\t''].*//' -e '/^$/d' $SERIES
else
return 1
fi