From 55012ec0b93351a0747b8d5d58b83ebc29dfaf61 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 18:32:23 +0100 Subject: [PATCH] Tweak progress bar message Say "copying" instead of "fetching" when copying from another local store. Nice for nixos-install. --- src/nix/progress-bar.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc index fb9955190..8bffda54a 100644 --- a/src/nix/progress-bar.cc +++ b/src/nix/progress-bar.cc @@ -167,7 +167,12 @@ public: if (type == actSubstitute) { auto name = storePathToName(getS(fields, 0)); - i->s = fmt("fetching " ANSI_BOLD "%s" ANSI_NORMAL " from %s", name, getS(fields, 1)); + auto sub = getS(fields, 1); + i->s = fmt( + hasPrefix(sub, "local") + ? "copying " ANSI_BOLD "%s" ANSI_NORMAL " from %s" + : "fetching " ANSI_BOLD "%s" ANSI_NORMAL " from %s", + name, sub); } if (type == actQueryPathInfo) {