guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/07: deduplication: Use nix-base32 encoding for link names.


From: guix-commits
Subject: 07/07: deduplication: Use nix-base32 encoding for link names.
Date: Fri, 21 Feb 2020 18:46:18 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 4cb63a564d413c745983a608790a943ac07f8d67
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sat Feb 22 00:40:30 2020 +0100

    deduplication: Use nix-base32 encoding for link names.
    
    Fixes <https://bugs.gnu.org/39725>.
    
    * guix/store/deduplication.scm (deduplicate): Use
    'bytevector->nix-base32-string' instead of 'bytevector->base16-string'.
---
 guix/store/deduplication.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm
index d42c409..8086869 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 <address@hidden>
-;;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,7 +23,7 @@
 (define-module (guix store deduplication)
   #:use-module (gcrypt hash)
   #:use-module (guix build utils)
-  #:use-module (guix base16)
+  #:use-module (guix base32)
   #:use-module (srfi srfi-11)
   #:use-module (rnrs io ports)
   #:use-module (ice-9 ftw)
@@ -140,7 +140,7 @@ PATH so that future duplicates can hardlink to it.  PATH is 
assumed to be
 under STORE."
   (let* ((links-directory (string-append store "/.links"))
          (link-file       (string-append links-directory "/"
-                                         (bytevector->base16-string hash))))
+                                         (bytevector->nix-base32-string 
hash))))
     (mkdir-p links-directory)
     (if (eq? 'directory (stat:type (lstat path)))
         ;; Can't hardlink directories, so hardlink their atoms.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]