diff options
| author | mat <mat@FreeBSD.org> | 2017-01-28 18:52:20 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2017-01-28 18:52:20 +0800 |
| commit | 8ae65954888f204bf2186f6d72cec5a01dbb477d (patch) | |
| tree | 40b320b186bfe7dd9dd3a53d2a0a8e7c0454c474 /Mk | |
| parent | 21c8ff4ded53fadf217ce2cd2cd7998e5b93511c (diff) | |
| download | freebsd-ports-gnome-8ae65954888f204bf2186f6d72cec5a01dbb477d.tar.gz freebsd-ports-gnome-8ae65954888f204bf2186f6d72cec5a01dbb477d.tar.zst freebsd-ports-gnome-8ae65954888f204bf2186f6d72cec5a01dbb477d.zip | |
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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/do-fetch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/Scripts/do-fetch.sh b/Mk/Scripts/do-fetch.sh index 879120e5cb07..6b646c96a83c 100644 --- a/Mk/Scripts/do-fetch.sh +++ b/Mk/Scripts/do-fetch.sh @@ -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." |