From e75a44649265b25281631cc2813ee7e708a9f82e Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 11 Oct 2012 10:42:10 -0700
Subject: [PATCH] Set staprun's verbosity one less than stap

Prior to commit e520ea8, staprun would get one -v for s.verbosity>1 and
a second -v for s.verbosity>2.  That commit unbounded the number of -v
for staprun, but changed the off-by-one, and staprun and stapio are too
chatty for that.

This also now sets stapdyn verbosity the same way.

* buildrun.cxx (make_run_command): Give one less -v flag.
  (make_dyninst_run_command): Set stapdyn -v flags the same way.
---
 buildrun.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/buildrun.cxx b/buildrun.cxx
index 1b068518e..f982f2a81 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -628,9 +628,9 @@ make_dyninst_run_command (systemtap_session& s, const string& remotedir,
 {
   vector<string> cmd;
   cmd.push_back(getenv("SYSTEMTAP_STAPDYN") ?: BINDIR "/stapdyn");
-  if (s.verbose > 1)
-    cmd.push_back("-v");
-  if (s.verbose > 2)
+
+  // use slightly less verbosity
+  for (unsigned i=1; i<s.verbose; i++)
     cmd.push_back("-v");
   if (s.suppress_warnings)
     cmd.push_back("-w");
@@ -657,7 +657,9 @@ make_run_command (systemtap_session& s, const string& remotedir,
   // for now, just spawn staprun
   vector<string> staprun_cmd;
   staprun_cmd.push_back(getenv("SYSTEMTAP_STAPRUN") ?: BINDIR "/staprun");
-  for (unsigned i=0; i<s.verbose; i++)
+
+  // use slightly less verbosity
+  for (unsigned i=1; i<s.verbose; i++)
     staprun_cmd.push_back("-v");
   if (s.suppress_warnings)
     staprun_cmd.push_back("-w");
-- 
2.43.5