diff options
| author | Dmitri Goutnik <dmgk@FreeBSD.org> | 2020-04-14 12:52:02 +0000 |
|---|---|---|
| committer | Dmitri Goutnik <dmgk@FreeBSD.org> | 2020-04-14 12:52:02 +0000 |
| commit | 30577a1486da235d7d5062284edc46a12d80e2c9 (patch) | |
| tree | 0ccf75285f2f5e5331ac48f96b4769a4152f9c57 /Mk/Uses/go.mk | |
| parent | devel/py-pendulum: Update to 2.1.0 (diff) | |
Mk/Uses/go.mk: Fix gomod-vendor-diff when there are 3 or fewer items in the GH_TUPLE
'make gomod-vendor-diff' currently doesn't work properly when modules2tuple
doesn't return the first empty line, when 3 or fewer items are in the GH_TUPLE
list.
PR: 245617
Submitted by: yuri
Notes
Notes:
svn path=/head/; revision=531678
Diffstat (limited to 'Mk/Uses/go.mk')
| -rw-r--r-- | Mk/Uses/go.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index c45181bd6156..1a025b2216cf 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -191,7 +191,7 @@ gomod-vendor: gomod-vendor-deps patch gomod-vendor-diff: gomod-vendor-deps patch @cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \ - [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${GREP} -v "^GH_TUPLE=" | ${SED} 's| \\$$||' > ${WRKDIR}/GH_TUPLE-new.txt && \ + [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=| |; s| \\$$||' | ${GREP} -v ' \\' > ${WRKDIR}/GH_TUPLE-new.txt && \ echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^| |" > ${WRKDIR}/GH_TUPLE-old.txt && \ ${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0 .endif |