build: fix gobootstrap path for the PPA

This commit is contained in:
Péter Szilágyi 2023-02-20 10:09:00 +02:00
parent e1e2781105
commit 4ec4235fc4
2 changed files with 2 additions and 1 deletions

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 # We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
# requirements opposed to older versions of Go. # requirements opposed to older versions of Go.
(mv .goboot ../ && cd ../.goboot/src && ./make.bash) (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) (mv .go ../ && cd ../.go/src && ./make.bash)
# We can't download external go modules within Launchpad, so we're shipping the # 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) time.Sleep(500 * time.Millisecond)
aborted = true aborted = true
sftp.Process.Kill() sftp.Process.Kill()
return
} }
} }
}() }()