Skip to content

Commit 5fc7c36

Browse files
authored
Merge pull request #2462 from BOINC/dpa_submit5
remote job submission: fix bug that caused spurious errors to be returned
2 parents f43e297 + c5f0b4a commit 5fc7c36

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

html/user/submit_rpc_handler.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -543,22 +543,22 @@ function n_outfiles($wu) {
543543
// error:
544544

545545
function show_job_details($wu) {
546-
if ($wu->error_mask && WU_ERROR_COULDNT_SEND_RESULT) {
546+
if ($wu->error_mask & WU_ERROR_COULDNT_SEND_RESULT) {
547547
echo " <error>couldnt_send_result</error>\n";
548548
}
549-
if ($wu->error_mask && WU_ERROR_TOO_MANY_ERROR_RESULTS) {
549+
if ($wu->error_mask & WU_ERROR_TOO_MANY_ERROR_RESULTS) {
550550
echo " <error>too_many_error_results</error>\n";
551551
}
552-
if ($wu->error_mask && WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
552+
if ($wu->error_mask & WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
553553
echo " <error>too_many_success_results</error>\n";
554554
}
555-
if ($wu->error_mask && WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
555+
if ($wu->error_mask & WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
556556
echo " <error>too_many_total_results</error>\n";
557557
}
558-
if ($wu->error_mask && WU_ERROR_CANCELLED) {
558+
if ($wu->error_mask & WU_ERROR_CANCELLED) {
559559
echo " <error>cancelled</error>\n";
560560
}
561-
if ($wu->error_mask && WU_ERROR_NO_CANONICAL_RESULT) {
561+
if ($wu->error_mask & WU_ERROR_NO_CANONICAL_RESULT) {
562562
echo " <error>no_canonical_result</error>\n";
563563
}
564564
$results = BoincResult::enum("workunitid=$wu->id");
@@ -569,7 +569,7 @@ function show_job_details($wu) {
569569
$in_progress++;
570570
break;
571571
}
572-
if ($wu->error_mask && $r->outcome == RESULT_OUTCOME_CLIENT_ERROR) {
572+
if ($wu->error_mask && ($r->outcome == RESULT_OUTCOME_CLIENT_ERROR)) {
573573
echo " <exit_status>$r->exit_status</exit_status>\n";
574574
}
575575
if ($r->id == $wu->canonical_resultid) {

0 commit comments

Comments
 (0)