Merge pull request #10050 from adrianschroeter/one_slave_less

One slave less

src/backend/BSConfig.pm.template

@@ -175,8 +175,8 @@ our $relsync_pool = {
 #our $sourcepublish_sync = 'rsync://127.0.0.1/sources';
 # optional filter to publish only some areas
 #our $sourcepublish_filter = [ "openSUSE:.*", "SUSE:.*" ];
-# optional filter to blacklist specific package names independend of the project
-#our $sourcepublish_blacklist = [ "flash-player", "binary-only-app" ];
+# optional filter to blocklist specific package names independend of the project
+#our $sourcepublish_blocklist = [ "flash-player", "binary-only-app" ];
 
 # Define your own global Macros
 #my $macro_packager = '<rpm@example.com>';

src/backend/bs_srcserver

@@ -6402,16 +6402,16 @@ sub external_notification_sourcepublish {
       push @included, { 'project' => $iproject, 'package' => $ipackage, 'srcmd5' => $imd5 };
     }
 
-    if ($BSConfig::sourcepublish_blacklist) {
+    if ($BSConfig::sourcepublish_blocklist) {
       my $xml = readxml("$projectsdir/$project.xml", $BSXML::proj, 1);
       die("400 Unable to parse $project.xml\n") unless $xml;
       if ( {$xml->{'kind'} || ''} eq 'maintenance_release' ) {
-        if (grep {$package =~ /^$_\./} @$BSConfig::sourcepublish_blacklist) {
-          BSUtil::printlog("black list hit for $package in maintenance release project");
+        if (grep {$package =~ /^$_\./} @$BSConfig::sourcepublish_blocklist) {
+          BSUtil::printlog("block list hit for $package in maintenance release project");
           return;
         }
-      } elsif (grep {$package eq $_} @$BSConfig::sourcepublish_blacklist) {
-        BSUtil::printlog("black list hit for $package");
+      } elsif (grep {$package eq $_} @$BSConfig::sourcepublish_blocklist) {
+        BSUtil::printlog("block list hit for $package");
         return;
       }
     }