Commit 53d50830 authored by Mike Hibler's avatar Mike Hibler
Browse files

Undo my ill-conceived fix for command line quoting in *tb_compat.tcl

node.tcl: Fix the quoting of the -dir argument for the program agent
(yeah, I know what you are thinking; but I am just mimicing what is
already done in sim.tcl::make_event)
parent 385c0a40
...@@ -559,7 +559,7 @@ Node instproc program-agent {args} { ...@@ -559,7 +559,7 @@ Node instproc program-agent {args} {
set curprog [new Program [$self set sim]] set curprog [new Program [$self set sim]]
$curprog set node $self $curprog set node $self
$curprog set command $(-command) $curprog set command $(-command)
$curprog set dir $(-dir) $curprog set dir "{$(-dir)}"
$curprog set expected-exit-code $(-expected-exit-code) $curprog set expected-exit-code $(-expected-exit-code)
if {$(-timeout) != {}} { if {$(-timeout) != {}} {
set to [::GLOBALS::reltime-to-secs $(-timeout)] set to [::GLOBALS::reltime-to-secs $(-timeout)]
......
...@@ -118,7 +118,7 @@ proc tb-set-node-startcmd {node command} { ...@@ -118,7 +118,7 @@ proc tb-set-node-startcmd {node command} {
perror "\[tb-set-node-startcmd] $node is not a node." perror "\[tb-set-node-startcmd] $node is not a node."
return return
} }
set command "{($command ; /usr/local/etc/emulab/startcmddone \$?)}" set command "($command ; /usr/local/etc/emulab/startcmddone \$?)"
set newprog [$node start-command $command] set newprog [$node start-command $command]
return $newprog return $newprog
......
...@@ -989,7 +989,7 @@ proc tb-set-node-startcmd {node command} { ...@@ -989,7 +989,7 @@ proc tb-set-node-startcmd {node command} {
perror "\[tb-set-node-startcmd] $node is not a node." perror "\[tb-set-node-startcmd] $node is not a node."
return return
} }
set command "{($command ; /usr/local/etc/emulab/startcmddone \$?)}" set command "($command ; /usr/local/etc/emulab/startcmddone \$?)"
set newprog [$node start-command $command] set newprog [$node start-command $command]
return $newprog return $newprog
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment