Tweak how log file is specified for bmsubmit.sh commands

*session.cxx: alter bmcommand ordering and include explicit " -o"
*tapset-method.cxx: alter assignment of log file and ordering in
		    bmsubmit.sh command

diff --git a/session.cxx b/session.cxx
index 9cccbc792618cd79525a84b7743763a0bf15700c..5be5f41888966cd40d0c16de27250169cc1a2383 100644 (file)
--- a/session.cxx
+++ b/session.cxx
@@ -2017,6 +2017,7 @@ systemtap_session::java_detach()
 {
   vector<string> bmcommand;
   bmcommand.push_back(bmsubmit_path);
+  bmcommand.push_back(" -o");
   bmcommand.push_back(byteman_log);
   bmcommand.push_back(" -u");
   bmcommand.push_back(byteman_script_path);

diff --git a/tapset-method.cxx b/tapset-method.cxx
index fd6e980295b900a3fcf6527fe31e03a56d35c9cb..bcf54cdaf52dfb1ea8af8bc35d11b2109fe67114 100644 (file)
--- a/tapset-method.cxx
+++ b/tapset-method.cxx
@@ -214,8 +214,9 @@ java_builder::build (systemtap_session & sess,
 
   vector<string> bmsubmit_cmd;
   sess.bmsubmit_path = (find_executable ("bmsubmit.sh"));
-  sess.byteman_log = " -o " + sess.tmpdir + "/byteman.log";
+  sess.byteman_log = sess.tmpdir + "/byteman.log";
   bmsubmit_cmd.push_back(sess.bmsubmit_path);
+  bmsubmit_cmd.push_back(" -o");
   bmsubmit_cmd.push_back(sess.byteman_log);
   bmsubmit_cmd.push_back(" -l");
   bmsubmit_cmd.push_back(sess.byteman_script_path);