maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printMsg(lvlError, ...) -> printError(...) etc.

Browse source
This commit is contained in:
Eelco Dolstra 2016-09-21 16:11:01 +02:00
parent 4036185cb4
commit c55bf085eb
30 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix/sigs.cc
View file

@ -84,7 +84,7 @@ struct CmdCopySigs : StorePathsCommand
pool.process();
printMsg(lvlInfo, format("imported %d signatures") % added);
printInfo(format("imported %d signatures") % added);
}
};
@ -132,7 +132,7 @@ struct CmdSignPaths : StorePathsCommand
}
}
printMsg(lvlInfo, format("added %d signatures") % added);
printInfo(format("added %d signatures") % added);
}
};

10
src/nix/verify.cc
View file

@ -87,7 +87,7 @@ struct CmdVerify : StorePathsCommand
if (hash.first != info->narHash) {
logger->incProgress(corruptedLabel);
corrupted = 1;
printMsg(lvlError,
printError(
format("path ‘%s’ was modified! expected hash ‘%s’, got ‘%s’")
% info->path % printHash(info->narHash) % printHash(hash.first));
}
@ -128,7 +128,7 @@ struct CmdVerify : StorePathsCommand
doSigs(info2->sigs);
} catch (InvalidPath &) {
} catch (Error & e) {
printMsg(lvlError, format(ANSI_RED "error:" ANSI_NORMAL " %s") % e.what());
printError(format(ANSI_RED "error:" ANSI_NORMAL " %s") % e.what());
}
}
@ -139,7 +139,7 @@ struct CmdVerify : StorePathsCommand
if (!good) {
logger->incProgress(untrustedLabel);
untrusted++;
printMsg(lvlError, format("path ‘%s’ is untrusted") % info->path);
printError(format("path ‘%s’ is untrusted") % info->path);
}
}
@ -148,7 +148,7 @@ struct CmdVerify : StorePathsCommand
done++;
} catch (Error & e) {
printMsg(lvlError, format(ANSI_RED "error:" ANSI_NORMAL " %s") % e.what());
printError(format(ANSI_RED "error:" ANSI_NORMAL " %s") % e.what());
logger->incProgress(failedLabel);
failed++;
}
@ -159,7 +159,7 @@ struct CmdVerify : StorePathsCommand
pool.process();
printMsg(lvlInfo, format("%d paths checked, %d untrusted, %d corrupted, %d failed")
printInfo(format("%d paths checked, %d untrusted, %d corrupted, %d failed")
% done % untrusted % corrupted % failed);
throw Exit(