1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

Remove some code added in r858[1], still don't know what it was supposed to

be doing at the time.

When fetching, the code was looking for a distfile in either its
DIST_SUBDIR or the main DISTDIR, which was ok.  Until a port
(devel/cargo) moves one of its distfile
(cargo-nightly-x86_64-unknown-freebsd.tar.gz) into a subdirectory.
do-fetch would see the distfile in DISTDIR and say, ok, it's there, and
checksum would not see it in its subdirectory and fail.

1: phabricator's blame mode is really, really, great to unroll history.

PR:		216442
Submitted by:	mat
Reported by:	Bob Willcox, dhw (on ports)
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D9318
This commit is contained in:
Mathieu Arnold 2017-01-28 10:52:20 +00:00
parent 9ffca42e8a
commit ce82850852
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=432617

View File

@ -44,11 +44,11 @@ for _file in "${@}"; do
fi
done
fi
if [ '(' -f "${file}" -o -f "$filebasename" ')' -a "$force_fetch" != "true" ]; then
if [ -f "${file}" -a "$force_fetch" != "true" ]; then
continue
fi
full_file="${dp_DIST_SUBDIR:+${dp_DIST_SUBDIR}/}${file}"
if [ -L "$file" -o -L "$filebasename" ]; then
if [ -L "$file" ]; then
${dp_ECHO_MSG} "=> ${dp_DISTDIR}/$file is a broken symlink."
${dp_ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"
${dp_ECHO_MSG} "=> Please correct this problem and try again."