summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 933b08d..76ed1fe 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 27 13:38:02 CET 2010 - hertzog@debian.org
+
+- quilt/scripts/patchfns.in: Skip non-files when selecting the
+ SERIES file.
+
+-------------------------------------------------------------------
Sat Jan 23 21:11:12 CET 2010 - jdelvare@suse.de
- test/run, test/*.test: Separate working directory for each test
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index 9528d2c..2b3d515 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -1097,10 +1097,10 @@ fi
if [ "${QUILT_SERIES:0:1}" = / ]
then
SERIES=$QUILT_SERIES
-elif [ -e $QUILT_PC/$QUILT_SERIES ]
+elif [ -f $QUILT_PC/$QUILT_SERIES ]
then
SERIES=$QUILT_PC/$QUILT_SERIES
-elif [ -e $QUILT_SERIES ]
+elif [ -f $QUILT_SERIES ]
then
SERIES=$QUILT_SERIES
else