lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Combine lock file update messages

Browse source
This commit is contained in:
Eelco Dolstra 2020-06-10 15:22:12 +02:00
parent fc6c7af424
commit 2226e97ec2
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/flake/flake.cc
View file

@ -498,9 +498,6 @@ LockedFlake lockFlake(
auto diff = diffLockFiles(oldLockFile, newLockFile); auto diff = diffLockFiles(oldLockFile, newLockFile);
if (!(oldLockFile == LockFile()))
printInfo("inputs of flake '%s' changed:\n%s", topRef, chomp(diff));
if (lockFlags.writeLockFile) { if (lockFlags.writeLockFile) {
if (auto sourcePath = topRef.input.getSourcePath()) { if (auto sourcePath = topRef.input.getSourcePath()) {
if (!newLockFile.isImmutable()) { if (!newLockFile.isImmutable()) {
@ -517,7 +514,7 @@ LockedFlake lockFlake(
bool lockFileExists = pathExists(path); bool lockFileExists = pathExists(path);
if (lockFileExists) if (lockFileExists)
warn("updating lock file '%s'", path); warn("updating lock file '%s':\n%s", path, chomp(diff));
else else
warn("creating lock file '%s'", path); warn("creating lock file '%s'", path);
@ -553,7 +550,7 @@ LockedFlake lockFlake(
} else } else
throw Error("cannot write modified lock file of flake '%s' (use '--no-write-lock-file' to ignore)", topRef); throw Error("cannot write modified lock file of flake '%s' (use '--no-write-lock-file' to ignore)", topRef);
} else } else
warn("not writing modified lock file of flake '%s'", topRef); warn("not writing modified lock file of flake '%s':\n%s", topRef, chomp(diff));
} }
return LockedFlake { .flake = std::move(flake), .lockFile = std::move(newLockFile) }; return LockedFlake { .flake = std::move(flake), .lockFile = std::move(newLockFile) };