[backend] support service generated PKGBUILD files

openSUSE · Jul 17, 2014 · b876429 · b876429
1 parent 55d7d50
commit b876429
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/backend/bs_sched b/src/backend/bs_sched
@@ -8505,20 +8505,15 @@ NEXTPRP:
       } elsif ($pdata->{'channel'}) {
 	$packtype = 'channel';
       } elsif ($info && $info->{'file'}) {
-	if ($info->{'file'} eq 'PKGBUILD') {
+	if ($info->{'file'} =~ /\.(spec|dsc|kiwi|livebuild)$/) {
+	  $packtype = $1;
+	} elsif ($info->{'file'} =~ /PKGBUILD$/) {
 	  $packtype = 'arch';
-	} elsif ($info->{'file'} eq '_preinstallimage') {
+	} elsif ($info->{'file'} =~ /_preinstallimage$/) {
 	  $packtype = 'preinstallimage';
-	} elsif ($info->{'file'} =~ /\.(spec|dsc|kiwi|livebuild)$/) {
-	  $packtype = $1;
-	  if ($packtype eq 'kiwi') {
-	    # check if it is kiwi-product
-	    if ($info->{'imagetype'} && $info->{'imagetype'}->[0] eq 'product') {
-	      $packtype = 'kiwi-product';
-	    } else {
-	      $packtype = 'kiwi-image';
-	    }
-	  }
+	}
+	if ($packtype eq 'kiwi') {
+	  $packtype = $info->{'imagetype'} && $info->{'imagetype'}->[0] eq 'product' ? 'kiwi-product' : 'kiwi-image';
 	}
       }
       $pkg2packtype{$packid} = $packtype;