diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
| commit | 17dddeeee560527a8f30d37761949d658056cb09 (patch) | |
| tree | 15b0b19c55787f556eb9b42c28d173bddc5435db /guix/store/deduplication.scm | |
| parent | 331a09654eb7e9f6212b7e8469077fa7393e8b11 (diff) | |
| parent | 6a9581741e4ee81226aeb2f1c997df76670a6aab (diff) | |
| download | guix-patches-17dddeeee560527a8f30d37761949d658056cb09.tar guix-patches-17dddeeee560527a8f30d37761949d658056cb09.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix/store/deduplication.scm')
| -rw-r--r-- | guix/store/deduplication.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm index a742a142ee..df959bdd06 100644 --- a/guix/store/deduplication.scm +++ b/guix/store/deduplication.scm @@ -164,8 +164,10 @@ under STORE." ((file . properties) (unless (member file '("." "..")) (let* ((file (string-append path "/" file)) - (type (or (assq-ref properties 'type) - (stat:type (lstat file))))) + (type (match (assoc-ref properties 'type) + ((or 'unknown #f) + (stat:type (lstat file))) + (type type)))) (loop file type (and (not (eq? 'directory type)) (nar-sha256 file))))))) |