Permalink
Browse files

build-remote: Use the --quiet flag

‘--option verbosity 0’ doesn't actually do anything.
  • Loading branch information...
1 parent 3e067ac commit dadf7a5b46f08b59c7e15a40937a9039ef273d63 @edolstra edolstra committed Feb 19, 2013
Showing with 3 additions and 6 deletions.
  1. +1 −1 scripts/build-remote.pl.in
  2. +2 −5 src/libmain/shared.cc
@@ -259,7 +259,7 @@ close UPLOADLOCK;
# Perform the build.
my $buildFlags =
"--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";
# We let the remote side kill its process group when the connection is
@@ -168,11 +168,10 @@ static void initAndRun(int argc, char * * argv)
remaining.clear();
/* Process default options. */
- int verbosityDelta = lvlInfo;
for (Strings::iterator i = args.begin(); i != args.end(); ++i) {
string arg = *i;
- if (arg == "--verbose" || arg == "-v") verbosityDelta++;
- else if (arg == "--quiet") verbosityDelta--;
+ if (arg == "--verbose" || arg == "-v") verbosity = (Verbosity) (verbosity + 1);
+ else if (arg == "--quiet") verbosity = verbosity > lvlError ? (Verbosity) (verbosity - 1) : lvlError;
else if (arg == "--log-type") {
string s = getArg(arg, i, args.end());
setLogType(s);
@@ -219,8 +218,6 @@ static void initAndRun(int argc, char * * argv)
else remaining.push_back(arg);
}
- verbosity = (Verbosity) (verbosityDelta < 0 ? 0 : verbosityDelta);
-
settings.update();
run(remaining);

0 comments on commit dadf7a5

Please sign in to comment.