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

refactor(3p/nix/nix-*): Replace logging with glog in binaries

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 04:52:47 +01:00
parent 9aa2ecd78c
commit 95a57f15ca
21 changed files with 120 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

11
third_party/nix/src/nix-copy-closure/nix-copy-closure.cc vendored
View file

@ -1,3 +1,4 @@
#include <glog/logging.h>
#include "legacy.hh"
#include "shared.hh"
#include "store-api.hh"
@ -21,10 +22,10 @@ static int _main(int argc, char** argv) {
else if (*arg == "--version")
printVersion("nix-copy-closure");
else if (*arg == "--gzip" || *arg == "--bzip2" || *arg == "--xz") {
if (*arg != "--gzip")
printMsg(lvlError, format("Warning: '%1%' is not implemented, "
"falling back to gzip") %
*arg);
if (*arg != "--gzip") {
LOG(WARNING) << "'" << *arg
<< "' is not implemented, falling back to gzip";
}
gzip = true;
} else if (*arg == "--from")
toMode = false;
@ -33,7 +34,7 @@ static int _main(int argc, char** argv) {
else if (*arg == "--include-outputs")
includeOutputs = true;
else if (*arg == "--show-progress")
printMsg(lvlError, "Warning: '--show-progress' is not implemented");
LOG(WARNING) << "'--show-progress' is not implemented";
else if (*arg == "--dry-run")
dryRun = true;
else if (*arg == "--use-substitutes" || *arg == "-s")