artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Bugfix for store.

Browse source 
* guile/guix/make.scm (store): Add each store file only once.
This commit is contained in:
Jan Nieuwenhuizen 2017-07-19 19:11:26 +02:00
parent 1bddb52c75
commit 37ed2c15bf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guile/guix/make.scm
View file

@ -144,6 +144,8 @@
(begin (set! %status 1) "FAIL")))))))))) (begin (set! %status 1) "FAIL"))))))))))
(define (hash-target o) (define (hash-target o)
(if (find (negate identity) (target-inputs o))
(format (current-error-port) "invalid inputs[~s]: ~s\n" (target-file-name o) (target-inputs o)))
(let ((inputs (target-inputs o))) (let ((inputs (target-inputs o)))
(if (null? inputs) (or (target-hash o) (target-hash (store #:add o))) (if (null? inputs) (or (target-hash o) (target-hash (store #:add o)))
(let ((input-shas (map hash-target inputs))) (let ((input-shas (map hash-target inputs)))
@ -186,8 +188,12 @@
(hash-target add)))) (hash-target add))))
(if (not key) (error "store: no hash for:" add)) (if (not key) (error "store: no hash for:" add))
(store #:add add #:key key))) (store #:add add #:key key)))
(add-file (and (file-exists? add-file) (add-file
(store #:add (target (file-name add-file))))) (or (and=> (find (lambda (t) (equal? (target-file-name t) add-file)) (map cdr *store*))
(compose (cut store #:get <>) target-hash))
(and (file-exists? add-file)
(store #:add (target (file-name add-file))))
(error (format #f "store add-file: no such file: ~s\n" add-file))))
((and get key) ((and get key)
(or (assoc-ref *store* key) (or (assoc-ref *store* key)
(let ((store-file (store-file-name key)) (let ((store-file (store-file-name key))