diff --git a/salt/manager/tools/sbin/so-yaml.py b/salt/manager/tools/sbin/so-yaml.py index 6f412b725..3558e57d8 100755 --- a/salt/manager/tools/sbin/so-yaml.py +++ b/salt/manager/tools/sbin/so-yaml.py @@ -346,7 +346,10 @@ def get(args): print(f"Key '{key}' not found by so-yaml.py", file=sys.stderr) return 2 - print(yaml.safe_dump(output)) + if isinstance(output, (dict, list)): + print(yaml.safe_dump(output).strip()) + else: + print(output) return 0 diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 60d0a9bda..16fb9e669 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -396,7 +396,7 @@ migrate_pcap_to_suricata() { for pillar_file in "$PCAPFILE" "$MINIONDIR"/*.sls; do [[ -f "$pillar_file" ]] || continue - pcap_enabled=$(so-yaml.py get "$pillar_file" pcap.enabled 2>/dev/null | head -1) || continue + pcap_enabled=$(so-yaml.py get "$pillar_file" pcap.enabled 2>/dev/null) || continue so-yaml.py add "$pillar_file" suricata.pcap.enabled "$pcap_enabled" so-yaml.py remove "$pillar_file" pcap done