TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build-remote: Use the --quiet flag 

‘--option verbosity 0’ doesn't actually do anything.
This commit is contained in:
Eelco Dolstra 2013-02-19 16:56:31 +01:00
parent 3e067ac11c
commit dadf7a5b46
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build-remote.pl.in
View File

@ -259,7 +259,7 @@ close UPLOADLOCK;
# Perform the build. # Perform the build.
my $buildFlags = my $buildFlags =
"--max-silent-time $maxSilentTime --option build-timeout $buildTimeout" "--max-silent-time $maxSilentTime --option build-timeout $buildTimeout"
. " --fallback --add-root $rootsDir/\$PPID.out --option verbosity 0" . " --fallback --add-root $rootsDir/\$PPID.out --quiet"
. " --option build-keep-log false"; . " --option build-keep-log false";
# We let the remote side kill its process group when the connection is # We let the remote side kill its process group when the connection is

7
src/libmain/shared.cc
View File

@ -168,11 +168,10 @@ static void initAndRun(int argc, char * * argv)
remaining.clear(); remaining.clear();
/* Process default options. */ /* Process default options. */
int verbosityDelta = lvlInfo;
for (Strings::iterator i = args.begin(); i != args.end(); ++i) { for (Strings::iterator i = args.begin(); i != args.end(); ++i) {
string arg = *i; string arg = *i;
if (arg == "--verbose" || arg == "-v") verbosityDelta++; if (arg == "--verbose" || arg == "-v") verbosity = (Verbosity) (verbosity + 1);
else if (arg == "--quiet") verbosityDelta--; else if (arg == "--quiet") verbosity = verbosity > lvlError ? (Verbosity) (verbosity - 1) : lvlError;
else if (arg == "--log-type") { else if (arg == "--log-type") {
string s = getArg(arg, i, args.end()); string s = getArg(arg, i, args.end());
setLogType(s); setLogType(s);
@ -219,8 +218,6 @@ static void initAndRun(int argc, char * * argv)
else remaining.push_back(arg); else remaining.push_back(arg);
} }
verbosity = (Verbosity) (verbosityDelta < 0 ? 0 : verbosityDelta);
settings.update(); settings.update();
run(remaining); run(remaining);