Date: Sat, 28 Jan 2017 10:52:20 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432617 - head/Mk/Scripts Message-ID: <201701281052.v0SAqKWi028799@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Jan 28 10:52:20 2017 New Revision: 432617 URL: https://svnweb.freebsd.org/changeset/ports/432617 Log: 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 Modified: head/Mk/Scripts/do-fetch.sh (contents, props changed) Modified: head/Mk/Scripts/do-fetch.sh ============================================================================== --- head/Mk/Scripts/do-fetch.sh Sat Jan 28 10:05:40 2017 (r432616) +++ head/Mk/Scripts/do-fetch.sh Sat Jan 28 10:52:20 2017 (r432617) @@ -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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701281052.v0SAqKWi028799>