[backend] do not prepend "service error" if the service is just in pr…

…ogress
openSUSE · Mar 20, 2017 · 10028f0 · 10028f0
1 parent 99ab1bf
commit 10028f0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/backend/BSSrcServer/Service.pm b/src/backend/BSSrcServer/Service.pm
@@ -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("service error: $serror\n");
+      die($serror eq 'service in progress' ? "$serror\n" : "service error: $serror\n");
     }
   }
   if ($sfiles) {
@@ -470,7 +470,9 @@ sub handleservice {
   }
   # don't have the tree yet
   my $serror = BSSrcrep::getserviceerror($rev->{'project'}, $rev->{'package'}, $servicemark);
-  die("service error: $serror\n") if $serror;
+  if ($serror) {
+    die($serror eq 'service in progress' ? "$serror\n" : "service error: $serror\n");
+  }
   my %nfiles = %$files;
   $nfiles{'/SERVICE'} = $servicemark;
   $rev->{'srcmd5'} = $lsrcmd5;	# put it back so that runservice can put it in /LSRCMD5