Skip to content

Commit

Permalink
[backend] prepend "service error: " when dying from a service error
Browse files Browse the repository at this point in the history
Otherwise the user does not have a clue what the error is about.
See github issue #2499.
  • Loading branch information
mlschroe committed Jan 2, 2017
1 parent dde86b1 commit 3464c66
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/backend/BSSrcServer/Service.pm
Expand Up @@ -454,7 +454,7 @@ sub handleservice {
$sfiles = BSRevision::lsrev($rrev);
if ($sfiles->{'_serviceerror'}) {
my $serror = BSSrcrep::getserviceerror($rev->{'project'}, $rev->{'package'}, $servicemark) || 'unknown service error';
die("$serror\n");
die("service error: $serror\n");
}
}
if ($sfiles) {
Expand All @@ -464,13 +464,13 @@ sub handleservice {
my $error = BSRevision::revreadstr($rev, '_service_error', $sfiles->{'_service_error'});
$error =~ s/[\r\n]+$//s;
$error =~ s/.*[\r\n]//s;
die(str2utf8xml($error ? "$error\n" : "unknown service error\n"));
die(str2utf8xml($error ? "service error: $error\n" : "unknown service error\n"));
}
return $sfiles;
}
# don't have the tree yet
my $serror = BSSrcrep::getserviceerror($rev->{'project'}, $rev->{'package'}, $servicemark);
die("$serror\n") if $serror;
die("service error: $serror\n") if $serror;
my %nfiles = %$files;
$nfiles{'/SERVICE'} = $servicemark;
$rev->{'srcmd5'} = $lsrcmd5; # put it back so that runservice can put it in /LSRCMD5
Expand Down

0 comments on commit 3464c66

Please sign in to comment.