bug#33911: SWH fallback is never reached due to an uncaught exception

[Ludovic Courtès]

Hi Björn,

Good catch!  I believe the bug was introduced by
329dabe13bf98b899b907b45565434c5140804f5.  I suppose I didn’t see it
when hacking on SWH support because I commented out the ‘git-fetch’ call
to test the other path.

Björn Höfling <address@hidden> skribis:

> The code is in git-download.scm, line 133:
>
>             (or (git-fetch (getenv "git url") (getenv "git commit")
>                            #$output
>                            #:recursive? recursive?
>                            #:git-command (string-append #+git "/bin/git"))
>                 (download-nar #$output)
>
>                 ;; As a last resort, attempt to download from Software 
> Heritage.
>                 ;; XXX: Currently recursive checkouts are not supported.
>                 (and (not recursive?)
>                      (swh-download (getenv "git url") (getenv "git commit")
>                                    #$output)))))))

Fixed in commit 18524466bb25a1926277b1111d15fb378ff7941e.  Now I get:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix build -S guile-bash --check
building 
/gnu/store/7w2xsqy12lyfshgpz61z8cg3s5zjsscs-guile-bash-0.1.6-0.1eabc56-checkout.drv...
environment variable `PATH' set to 
`/gnu/store/q09sy224qnxrp982z4xfaxi19721mjx8-gzip-1.9/bin:/gnu/store/ipx79bfj2mrc8npj7s3qi3zri11jfhaw-tar-1.30/bin'
Initialized empty Git repository in 
/gnu/store/7p7mkiqv9ah6x0x20qzpas44sdf7jqkl-guile-bash-0.1.6-0.1eabc56-checkout/.git/
fatal: repository 
'https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git/'
 not found
Failed to do a shallow fetch; retrying a full fetch...
fatal: repository 
'https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git/'
 not found
git-fetch: 
'/gnu/store/26s82xpawy0z13lfhkd7iprr2ahcbl5f-git-minimal-2.20.1/bin/git fetch 
origin' failed with exit code 128
Trying content-addressed mirror at mirror.hydra.gnu.org...
Downloading from 
http://mirror.hydra.gnu.org/guix/nar/gzip/7p7mkiqv9ah6x0x20qzpas44sdf7jqkl-guile-bash-0.1.6-0.1eabc56-checkout
 (0.04 MiB)...
 7p7mki...-guile-bash-0.1.6-0.1eabc56-checkout  37KiB 730KiB/s 00:00 
[##################] 100.0%
/gnu/store/7p7mkiqv9ah6x0x20qzpas44sdf7jqkl-guile-bash-0.1.6-0.1eabc56-checkout
--8<---------------cut here---------------end--------------->8---

Thanks for the heads-up!

Ludo’.