From 42808fa281dfc2661d82c1f6145982f20970a004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 17 Sep 2015 12:08:49 +0200
Subject: [PATCH] nix-env --upgrade: show "downgrading" when doing so
It was strange to show "upgrading" when the version was getting lower.
This is left on "upgrading" when the versions are the same,
as I can't see any better wording.
---
src/nix-env/nix-env.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index ddbba2484..400b148e9 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -602,9 +602,11 @@ static void upgradeDerivations(Globals & globals,
i.queryOutPath() !=
bestElem->queryOutPath())
{
+ const char * action = compareVersions(drvName.version, bestVersion) <= 0
+ ? "upgrading" : "downgrading";
printMsg(lvlInfo,
- format("upgrading ‘%1%’ to ‘%2%’")
- % i.name % bestElem->name);
+ format("%1% ‘%2%’ to ‘%3%’")
+ % action % i.name % bestElem->name);
newElems.push_back(*bestElem);
} else newElems.push_back(i);
--
GitLab