[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: pack: '--localstatedir' and '-R' tests gracefully handle missing
|
From: |
guix-commits |
|
Subject: |
03/03: pack: '--localstatedir' and '-R' tests gracefully handle missing /gnu/store. |
|
Date: |
Sat, 18 May 2019 06:27:05 -0400 (EDT) |
civodul pushed a commit to branch version-1.0.1
in repository guix.
commit baab87ac49e3f0f873e17eb16db9781189b1f2d1
Author: Ludovic Courtès <address@hidden>
Date: Sat May 18 12:21:34 2019 +0200
pack: '--localstatedir' and '-R' tests gracefully handle missing /gnu/store.
Fixes <https://bugs.gnu.org/35776>.
Reported by Ting-Wei Lan <address@hidden>.
* tests/guix-pack-localstatedir.sh: Set 'storedir' before
'NIX_STORE_DIR'.
* tests/guix-pack-relocatable.sh: Likewise.
---
tests/guix-pack-localstatedir.sh | 5 +++--
tests/guix-pack-relocatable.sh | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/guix-pack-localstatedir.sh b/tests/guix-pack-localstatedir.sh
index b734b0f..042887e 100644
--- a/tests/guix-pack-localstatedir.sh
+++ b/tests/guix-pack-localstatedir.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2018 Ludovic Courtès <address@hidden>
+# Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
#
# This file is part of GNU Guix.
#
@@ -27,8 +27,9 @@ guix pack --version
# the test in the user's global store if possible, on the grounds that
# binaries may already be there or can be built or downloaded inexpensively.
-NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
+storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
localstatedir="`guile -c '(use-modules (guix config))(display
%localstatedir)'`"
+NIX_STORE_DIR="$storedir"
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh
index c45a679..ebada62 100644
--- a/tests/guix-pack-relocatable.sh
+++ b/tests/guix-pack-relocatable.sh
@@ -27,8 +27,9 @@ guix pack --version
# run it on the user's global store if possible, on the grounds that binaries
# may already be there or can be built or downloaded inexpensively.
-NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
+storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
localstatedir="`guile -c '(use-modules (guix config))(display
%localstatedir)'`"
+NIX_STORE_DIR="$storedir"
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
export NIX_STORE_DIR GUIX_DAEMON_SOCKET