Skip to content
This repository has been archived by the owner on Nov 29, 2021. It is now read-only.

Fix get_status (backport #471) #472

Merged
merged 3 commits into from
Oct 21, 2021
Merged

Fix get_status (backport #471) #472

merged 3 commits into from
Oct 21, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 13, 2021

This is an automatic backport of pull request #471 done by Mergify.
Cherry-pick of a682e99 has failed:

On branch mergify/bp/master/pr-471
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit a682e99.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ospd/ospd.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ospd/scan.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Avoid ospd to crash when get_status is called with a wrong scan id

(cherry picked from commit a682e99)

# Conflicts:
#	ospd/scan.py
@mergify mergify bot requested a review from a team as a code owner October 13, 2021 07:02
@mergify mergify bot added the conflicts label Oct 13, 2021
Also, update changelog
@codecov
Copy link

codecov bot commented Oct 13, 2021

Codecov Report

Merging #472 (bf0b74f) into main (93aee16) will decrease coverage by 0.00%.
The diff coverage is 80.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #472      +/-   ##
==========================================
- Coverage   75.25%   75.25%   -0.01%     
==========================================
  Files          23       23              
  Lines        2675     2683       +8     
==========================================
+ Hits         2013     2019       +6     
- Misses        662      664       +2     
Impacted Files Coverage Δ
ospd/scan.py 91.91% <75.00%> (-0.55%) ⬇️
ospd/ospd.py 73.38% <100.00%> (+0.04%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 93aee16...bf0b74f. Read the comment docs.

@jjnicola jjnicola added Conflicts fixed Conflicts were fixed and removed conflicts labels Oct 21, 2021
@jjnicola jjnicola merged commit 08ad6e5 into main Oct 21, 2021
@jjnicola jjnicola deleted the mergify/bp/master/pr-471 branch October 21, 2021 09:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Conflicts fixed Conflicts were fixed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant