Commit 604120cb authored by Leigh Stoller's avatar Leigh Stoller

Minor bug fixes.

parent 5c44b34e
......@@ -57,7 +57,7 @@ sub usage()
" -w Wait for image to be created\n");
exit(-1);
}
my $optlist = "densg:wFr";
my $optlist = "densg:wFr:";
my $debug = 0;
my $wholedisk = 0;
my $impotent = 0;
......
......@@ -668,8 +668,10 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
function ShowTopo(uuid)
{
var callback = function(json) {
#console.info(json);
if ($("#manifest_textarea").length) {
$("#manifest_textarea").html(json.value);
$("#manifest_textarea").val(json.value);
$("#manifest_textarea").css("height", "300");
}
......
......@@ -126,7 +126,7 @@ function Do_TerminateInstance()
return;
}
if ($webtask && $webtask->exited()) {
SPITAJAX_ERROR(1, $webtask->TaskData("output"));
SPITAJAX_ERROR(1, $webtask->TaskValue("output"));
$webtask->Delete();
}
else {
......@@ -353,7 +353,7 @@ function Do_ConsoleURL()
return;
}
if ($webtask) {
SPITAJAX_ERROR(1, $webtask->TaskData("output"));
SPITAJAX_ERROR(1, $webtask->TaskValue("output"));
$webtask->Delete();
}
else {
......@@ -414,6 +414,7 @@ function Do_Snapshot()
$webtask = WebTask::Lookup($webtask_id);
if ($retval != 0) {
SUEXECERROR(SUEXEC_ACTION_CONTINUE);
if ($retval < 0) {
SPITAJAX_ERROR(-11, "Internal error, cannot proceed.");
# Notify tbops.
......@@ -421,7 +422,7 @@ function Do_Snapshot()
return;
}
if ($webtask) {
SPITAJAX_ERROR(1, $webtask->TaskData("output"));
SPITAJAX_ERROR(1, $webtask->TaskValue("output"));
$webtask->Delete();
}
else {
......
Markdown is supported
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