From 52693f21599e5cee3021d3b85464f2be36283310 Mon Sep 17 00:00:00 2001
From: David Trudgian <david.trudgian@sylabs.io>
Date: Tue, 7 Dec 2021 13:20:25 -0600
Subject: [PATCH] fix: ensure gengodep uses vendor dir if present

In a previous PR, initialization of the `srcdir` varible was removed
from `makeit/gengodep`. However, the `gengodep` script was still using
`srcdir` when checking for a `${srcdir}/vendor/modules.txt`.

https://github.com/sylabs/singularity/commit/48e7fab83e11a698adbd506d60e13fb375b00fec#

As a result, the vendor dir is never found, and `go` was run with
`-mod=readonly`, which would lead to downloads.

Since go 1.14 the presence of a vendor dir infers `-mod=vendor`
automatically, so we can just remove the handling here.

Fixes #461
---
 makeit/gengodep | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/makeit/gengodep b/makeit/gengodep
index d38ce78e88..7aa2353fbb 100755
--- a/makeit/gengodep
+++ b/makeit/gengodep
@@ -28,15 +28,9 @@ shift 4
 # get propagated down to go list.
 export GOPROXY
 
-if test -e "${srcdir}/vendor/modules.txt" ; then
-	mod_mode=vendor
-else
-	mod_mode=readonly
-fi
-
 template='{{ with $d := . }}{{ if not $d.Standard }}{{ range $d.GoFiles }}{{ printf "%s/%s\n" $d.Dir . }}{{ end }}{{ range $d.CgoFiles }}{{ printf "%s/%s\n" $d.Dir . }}{{ end }}{{ end }}{{ end }}'
 
-godeps=`${go} list -mod=${mod_mode} -deps -f "${template}" -tags "${gotags}" "$@" | sort -u`
+godeps=`${go} list -deps -f "${template}" -tags "${gotags}" "$@" | sort -u`
 
 for m in ${godeps}; do
     echo "$var += $m" >> ${depfile}