Hi,
On Sun, 24 Jan 2010, Jean Delvare wrote:
> > -if [ "${QUILT_SERIES:0:1}" = / ]
> > +if [ "${QUILT_SERIES:0:1}" = / -a \( -f $QUILT_SERIES -o ! -e
> > $QUILT_SERIES \) ]
>
> This doesn't make sense to me. If the series file is an absolute
> path, then none of the cases below can apply. If the absolute path
> points to a non-file then this is a user error and we should report
> it and abort immediately.
OK, then no need to error out here, the appropriate checks are already in
place elsewhere in the code (commit
8c3585bce0470d471d2179cbdfeead133dfdf867). Updated patch attached.
Cheers,
--
Raphaël Hertzog
>From ba39a9a476bcce35e67c4b95c0b6beee0a31beb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <[email protected]>
Date: Sat, 23 Jan 2010 22:22:39 +0100
Subject: [PATCH] Skip non-files when selecting the SERIES file
When selecting the location of the SERIES file, ensure that we
don't accidentally select a non-file (for example a directory)
when there still are other locations to try.
Bug-Debian: http://bugs.debian.org/546393
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/428657
---
quilt/scripts/patchfns.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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
--
1.6.6
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
