[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/376: Replace message "importing path <...>" with "exporting path <...
From: |
Ludovic Courtès |
Subject: |
47/376: Replace message "importing path <...>" with "exporting path <...>" |
Date: |
Wed, 28 Jan 2015 22:03:57 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit edbfe2232e275a9e6c10cd8eb4dc36ca992af084
Author: Eelco Dolstra <address@hidden>
Date: Thu Jul 10 21:30:22 2014 +0200
Replace message "importing path <...>" with "exporting path <...>"
This causes nix-copy-closure to show what it's doing before rather
than after.
---
src/libstore/local-store.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e66042c..7d78ab7 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1486,6 +1486,8 @@ void LocalStore::exportPath(const Path & path, bool sign,
{
assertStorePath(path);
+ printMsg(lvlInfo, format("exporting path `%1%'") % path);
+
addTempRoot(path);
if (!isValidPath(path))
throw Error(format("path `%1%' is not valid") % path);
@@ -1596,8 +1598,6 @@ Path LocalStore::importPath(bool requireSignature, Source
& source)
Path dstPath = readStorePath(hashAndReadSource);
- printMsg(lvlInfo, format("importing path `%1%'") % dstPath);
-
PathSet references = readStorePaths<PathSet>(hashAndReadSource);
Path deriver = readString(hashAndReadSource);
- 23/376: findFile: Realise the context of the path attributes, (continued)
- 23/376: findFile: Realise the context of the path attributes, Ludovic Courtès, 2015/01/28
- 44/376: nix-copy-closure: Fix --dry-run, Ludovic Courtès, 2015/01/28
- 46/376: Fix use of sysread, Ludovic Courtès, 2015/01/28
- 45/376: nix-copy-closure -s: Do substitutions via ‘nix-store --serve’, Ludovic Courtès, 2015/01/28
- 48/376: Fix broken Pid constructor, Ludovic Courtès, 2015/01/28
- 42/376: Refactoring: Move all fork handling into a higher-order function, Ludovic Courtès, 2015/01/28
- 49/376: Allow $NIX_BUILD_HOOK to be relative to Nix libexec directory, Ludovic Courtès, 2015/01/28
- 52/376: Fix test, Ludovic Courtès, 2015/01/28
- 54/376: build-remote.pl: Don't keep a shell process around, Ludovic Courtès, 2015/01/28
- 55/376: build-remote.pl: Fix building multiple output derivations, Ludovic Courtès, 2015/01/28
- 47/376: Replace message "importing path <...>" with "exporting path <...>",
Ludovic Courtès <=
- 58/376: Pass *_proxy vars to bootstrap fetchurl, Ludovic Courtès, 2015/01/28
- 51/376: build-remote.pl: Use ‘nix-store --serve’ on the remote side, Ludovic Courtès, 2015/01/28
- 50/376: Fix closure size display, Ludovic Courtès, 2015/01/28
- 63/376: Get rid of a compiler warning, Ludovic Courtès, 2015/01/28
- 43/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 64/376: nix-daemon: Fix compat with older clients, Ludovic Courtès, 2015/01/28
- 57/376: Manual: Typo, Ludovic Courtès, 2015/01/28
- 53/376: build-remote.pl: Fix build log, Ludovic Courtès, 2015/01/28
- 61/376: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/01/28
- 66/376: nix-daemon: Show name of connecting user, Ludovic Courtès, 2015/01/28