c885bd0274
The --quiet and -v/--verbose flags were removed during the glog conversion ind0c44425e1, which has previously broken programs like e.g. home-manager, which passes --quiet to nix-build. A nix-build-specific workaround was added in24f9354d5b, which manipulates the FLAGS_stderrthreshold global variable from glog. This commit moves the --quiet logic back into the argument handling code in libmain, and adds corresponding handling for -v/--verbose. Change-Id: I13d860ebbb78541d9f1236691a1efe8bd2163c67 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2170 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
56 lines
1.4 KiB
C++
56 lines
1.4 KiB
C++
#include "libmain/common-args.hh"
|
|
|
|
#include <glog/logging.h>
|
|
|
|
#include "libstore/globals.hh"
|
|
|
|
namespace nix {
|
|
|
|
MixCommonArgs::MixCommonArgs(const std::string& programName)
|
|
: programName(programName) {
|
|
mkFlag()
|
|
.longName("verbose")
|
|
.shortName('v')
|
|
.description("increase verbosity level")
|
|
.handler([]() {
|
|
FLAGS_stderrthreshold = google::GLOG_INFO;
|
|
FLAGS_v += 1;
|
|
});
|
|
|
|
mkFlag()
|
|
.longName("quiet")
|
|
.description("silence all log output")
|
|
.handler([]() { FLAGS_stderrthreshold = google::GLOG_FATAL; });
|
|
|
|
mkFlag()
|
|
.longName("option")
|
|
.labels({"name", "value"})
|
|
.description("set a Nix configuration option (overriding nix.conf)")
|
|
.arity(2)
|
|
.handler([](std::vector<std::string> ss) {
|
|
try {
|
|
globalConfig.set(ss[0], ss[1]);
|
|
} catch (UsageError& e) {
|
|
LOG(WARNING) << e.what();
|
|
}
|
|
});
|
|
|
|
mkFlag()
|
|
.longName("max-jobs")
|
|
.shortName('j')
|
|
.label("jobs")
|
|
.description("maximum number of parallel builds")
|
|
.handler([=](const std::string& s) { settings.set("max-jobs", s); });
|
|
|
|
std::string cat = "config";
|
|
globalConfig.convertToArgs(*this, cat);
|
|
|
|
// Backward compatibility hack: nix-env already had a --system flag.
|
|
if (programName == "nix-env") {
|
|
longFlags.erase("system");
|
|
}
|
|
|
|
hiddenCategories.insert(cat);
|
|
}
|
|
|
|
} // namespace nix
|