Hi Raphael, Le samedi 23 janvier 2010 22:46, Raphaël Hertzog a écrit : > 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 | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in > index 9528d2c..05b7c63 100644 > --- a/quilt/scripts/patchfns.in > +++ b/quilt/scripts/patchfns.in > @@ -1094,13 +1094,13 @@ else > : ${QUILT_SERIES:=series} > fi > > -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. > 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 The other changes look good to me. -- Jean Delvare Suse L3 _______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
