From 4cb63a564d413c745983a608790a943ac07f8d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Feb 2020 00:40:30 +0100 Subject: deduplication: Use nix-base32 encoding for link names. Fixes . * 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 d42c40932c..80868692c0 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 -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; 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. -- cgit v1.2.3