mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade-nix: add --dry-run

Browse source
This commit is contained in:
Daiderd Jordan 2018-08-25 20:25:43 +02:00
parent c651b7bdc9
commit 414397759a
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nix/upgrade-nix.cc
View file

@ -1,4 +1,5 @@
#include "command.hh"
#include "common-args.hh"
#include "store-api.hh"
#include "download.hh"
#include "eval.hh"
@ -6,7 +7,7 @@
using namespace nix;
struct CmdUpgradeNix : StoreCommand
struct CmdUpgradeNix : MixDryRun, StoreCommand
{
Path profileDir;
@ -61,21 +62,25 @@ struct CmdUpgradeNix : StoreCommand
{
Activity act(*logger, lvlInfo, actUnknown, fmt("downloading '%s'...", storePath));
store->ensurePath(storePath);
if (!dryRun)
store->ensurePath(storePath);
}
{
Activity act(*logger, lvlInfo, actUnknown, fmt("verifying that '%s' works...", storePath));
auto program = storePath + "/bin/nix-env";
auto s = runProgram(program, false, {"--version"});
if (s.find("Nix") == std::string::npos)
throw Error("could not verify that '%s' works", program);
if (!dryRun) {
auto program = storePath + "/bin/nix-env";
auto s = runProgram(program, false, {"--version"});
if (s.find("Nix") == std::string::npos)
throw Error("could not verify that '%s' works", program);
}
}
{
Activity act(*logger, lvlInfo, actUnknown, fmt("installing '%s' into profile '%s'...", storePath, profileDir));
runProgram(settings.nixBinDir + "/nix-env", false,
{"--profile", profileDir, "-i", storePath, "--no-sandbox"});
if (!dryRun)
runProgram(settings.nixBinDir + "/nix-env", false,
{"--profile", profileDir, "-i", storePath, "--no-sandbox"});
}
}