Skip to content

Commit

Permalink
Merge pull request #2472 from gethvi/fix-2471
Browse files Browse the repository at this point in the history
Fixes #2471
  • Loading branch information
sebix authored Apr 9, 2024
2 parents d4ea2ad + 3a3a475 commit 6683c88
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions intelmq/lib/upgrades.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def v110_shadowserver_feednames(configuration, harmonization, dry_run, **kwargs)
if bot_id == 'global':
continue
if bot["module"] == "intelmq.bots.parsers.shadowserver.parser":
if bot["parameters"]["feedname"] in mapping:
if bot["parameters"].get("feedname") and bot["parameters"]["feedname"] in mapping:
changed = True
bot["parameters"]["feedname"] = mapping[bot["parameters"]["feedname"]]

Expand Down Expand Up @@ -760,7 +760,7 @@ def v310_shadowserver_feednames(configuration, harmonization, dry_run, **kwargs)
if bot_id == 'global':
continue
if bot["module"] == "intelmq.bots.parsers.shadowserver.parser":
if bot["parameters"]["feedname"] in legacy:
if bot["parameters"].get("feedname") and bot["parameters"]["feedname"] in legacy:
names.append(bot["parameters"]["feedname"])
return 'A discontinued feed has been found and must be removed %s' % ', '.join(names) if names else changed, configuration, harmonization

Expand Down

0 comments on commit 6683c88

Please sign in to comment.