34c4e47c9b
- Allow NamedLoaderContexts to be returned from loader - Revert the change making reactor less blocking (bsc#1230322) - Use --cachedir for extension_modules in salt-call (bsc#1226141) - Prevent using SyncWrapper with no reason - Added: * avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch * allow-namedloadercontexts-to-be-returned-from-loader.patch * revert-the-change-making-reactor-less-blocking-bsc-1.patch * use-cachedir-for-extension_modules-in-salt-call-bsc-.patch * prevent-using-syncwrapper-with-no-reason.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=259
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From e7ef0b5a46cc69a9237033d8dc4dbc60c0802a20 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graul <agraul@suse.com>
|
|
Date: Mon, 31 Jan 2022 10:24:26 +0100
|
|
Subject: [PATCH] Drop serial from event.unpack in cli.batch_async
|
|
|
|
---
|
|
salt/cli/batch_async.py | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/cli/batch_async.py b/salt/cli/batch_async.py
|
|
index 09aa85258b..1012ce37cc 100644
|
|
--- a/salt/cli/batch_async.py
|
|
+++ b/salt/cli/batch_async.py
|
|
@@ -9,7 +9,6 @@ import logging
|
|
|
|
import salt.client
|
|
import salt.ext.tornado
|
|
-import tornado
|
|
from salt.cli.batch import batch_get_eauth, batch_get_opts, get_bnum
|
|
|
|
log = logging.getLogger(__name__)
|
|
@@ -109,7 +108,7 @@ class BatchAsync:
|
|
if not self.event:
|
|
return
|
|
try:
|
|
- mtag, data = self.event.unpack(raw, self.event.serial)
|
|
+ mtag, data = self.event.unpack(raw)
|
|
for (pattern, op) in self.patterns:
|
|
if mtag.startswith(pattern[:-1]):
|
|
minion = data["id"]
|
|
--
|
|
2.39.2
|
|
|
|
|