diff options
author | Raphaƫl Hertzog <hertzog@debian.org> | 2010-01-23 22:22:39 +0100 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2010-01-27 13:49:51 +0100 |
commit | 0f702aa9f3457aaa7fbfc6148e9b6f28036effe6 (patch) | |
tree | 4f2e3a281b66772f7a5026f398ae6fe41f4afd8c | |
parent | aec8cb5d622a24c1d3ce7a06cfc50e037fb676e7 (diff) | |
download | quilt-0f702aa9f3457aaa7fbfc6148e9b6f28036effe6.tar.gz |
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
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 4 |
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 |