Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
2 changed files with 2 additions and 1 deletions
Showing only changes of commit 4ec4235fc4 - Show all commits

View File

@ -20,7 +20,7 @@ override_dh_auto_build:
# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
# requirements opposed to older versions of Go.
(mv .goboot ../ && cd ../.goboot/src && ./make.bash)
export GOROOT_BOOTSTRAP=`pwd`/../.goboot/bin
export GOROOT_BOOTSTRAP=`pwd`/../.goboot
(mv .go ../ && cd ../.go/src && ./make.bash)
# We can't download external go modules within Launchpad, so we're shipping the

View File

@ -176,6 +176,7 @@ func UploadSFTP(identityFile, host, dir string, files []string) error {
time.Sleep(500 * time.Millisecond)
aborted = true
sftp.Process.Kill()
return
}
}
}()