From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 23 Jan 2019 21:27:29 +0000 (+0100)
Subject: deduplication: Ignore EMLINK.
X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/ba5e89be8cfa3428d7b41954df8af792986eb5ee

deduplication: Ignore EMLINK.

Until now 'guix offload' would fail (transient failure) upon EMLINK.

* guix/store/deduplication.scm (replace-with-link)
(deduplicate): Ignore EMLINK.
---

diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm
index a777940f86..8ca16a4cd8 100644
--- a/guix/store/deduplication.scm
+++ b/guix/store/deduplication.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>
-;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -109,8 +109,9 @@ Note: TARGET, TO-REPLACE, and SWAP-DIRECTORY must be on the same file system."
         (get-temp-link target swap-directory))
       (lambda args
         ;; We get ENOSPC when we can't fit an additional entry in
-        ;; SWAP-DIRECTORY.
-        (if (= ENOSPC (system-error-errno args))
+        ;; SWAP-DIRECTORY.  If it's EMLINK, then TARGET has reached its
+        ;; maximum number of links.
+        (if (memv (system-error-errno args) `(,ENOSPC ,EMLINK))
             #f
             (apply throw args)))))
 
@@ -169,4 +170,8 @@ under STORE."
                          ;; more entries in .links, but that's fine: we can
                          ;; just stop.
                          #f)
+                        ((= errno EMLINK)
+                         ;; PATH has reached the maximum number of links, but
+                         ;; that's OK: we just can't deduplicate it more.
+                         #f)
                         (else (apply throw args))))))))))