me
/
guix
Archived
1
0
Fork 0
Code

grafts: Don't rely on substitute info for missing store items. 

Fixes <https://bugs.gnu.org/22990>.

* guix/grafts.scm (references-oracle)[references*]: Remove call to
'substitution-oracle' and to 'references/substitutes'.  Use
'references/cached' and 'build-derivations' right away instead.
master
Ludovic Courtès 2020-03-25 14:46:34 +01:00
parent c70cf1a724
commit 710854304b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/grafts.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -166,22 +166,14 @@ references. Call REFERENCES to get the list of references."
(define (references-oracle store input) (define (references-oracle store input)
"Return a one-argument procedure that, when passed the output file names of "Return a one-argument procedure that, when passed the output file names of
INPUT, a derivation input, or their dependencies, returns the list of INPUT, a derivation input, or their dependencies, returns the list of
references of that item. Use either local info or substitute info; build references of that item. Build INPUT if it's not available."
INPUT if no information is available."
(define (references* items) (define (references* items)
;; Return the references of ITEMS.
(guard (c ((store-protocol-error? c) (guard (c ((store-protocol-error? c)
;; As a last resort, build DRV and query the references of the ;; ITEMS are not in store so build INPUT first.
;; build result.
;; Warm up the narinfo cache, otherwise each derivation build
;; will result in one HTTP request to get one narinfo, which is
;; much less efficient than fetching them all upfront.
(substitution-oracle store
(list (derivation-input-derivation input)))
(and (build-derivations store (list input)) (and (build-derivations store (list input))
(map (cut references store <>) items)))) (map (cut references/cached store <>) items))))
(references/substitutes store items))) (map (cut references/cached store <>) items)))
(let loop ((items (derivation-input-output-paths input)) (let loop ((items (derivation-input-output-paths input))
(result vlist-null)) (result vlist-null))