]> git.ipfire.org Git - thirdparty/suricata-update.git/commit
projects / thirdparty / suricata-update.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 726c121) | patch
fix: fix --no-merge option 270/head
authorJason <jason.ish@oisf.net>
Mon, 15 Feb 2021 22:35:27 +0000 (16:35 -0600)
committerJason <jason.ish@oisf.net>
Mon, 15 Feb 2021 22:35:27 +0000 (16:35 -0600)
commitfa8fb27255c46c92d24a969518f4665c72d07dbd
tree1067133f497abff55e0390eacfd6e38e386b0b1btree
parent726c121a6765a16651994ed0bae67cddfdffdf3ecommit | diff
fix: fix --no-merge option

The no-merge handling was not updated when the file storage
was converted to a list causing it to fail.

Also add a --no-merge test to our integration test.

Fixes issue:
https://redmine.openinfosecfoundation.org/issues/4324
suricata/update/main.py diff | blob | blame | history
tests/integration_tests.py diff | blob | blame | history
Mirror of https://github.com/OISF/suricata-update.git