Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.0-stable] pillar/assignableadapters: clear error strings #4240

Conversation

christoph-zededa
Copy link
Contributor

  1. create two usb adapters with collision
  2. change the usbaddr of one of the adapters

now the collision should be gone, but
as the error string for both adapters has been set, it was not cleared

Copy link
Member

@OhmSpectator OhmSpectator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please use the -x when cherry-picking commits?
It's minor. Rather than that - fine.

@OhmSpectator
Copy link
Member

lol, why does Yetus scream only here...

@christoph-zededa christoph-zededa force-pushed the 12.0-stable_clear_err_on_usb_collision branch 2 times, most recently from 60dbfb6 to 93381b6 Compare September 11, 2024 15:28
@OhmSpectator
Copy link
Member

@christoph-zededa don't we have to port it into 11.0-stable?

@christoph-zededa
Copy link
Contributor Author

@christoph-zededa don't we have to port it into 11.0-stable?

I don't see the affected code in 11.0-stable

@christoph-zededa christoph-zededa marked this pull request as draft September 11, 2024 16:52
@christoph-zededa christoph-zededa marked this pull request as ready for review September 12, 2024 10:51
@OhmSpectator
Copy link
Member

@christoph-zededa can we close this PR for now, if you want to replace it with a new one?

@christoph-zededa christoph-zededa marked this pull request as draft September 12, 2024 14:04
@christoph-zededa
Copy link
Contributor Author

@christoph-zededa can we close this PR for now, if you want to replace it with a new one?

I will use this PR, but now it is in draft.

Copy link
Member

@OhmSpectator OhmSpectator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please take the commit hash from the master branch, not from the original feature branch?

for usb collisions:

1. create two usb adapters with collision
2. change the usbaddr of one of the adapters

now the collision should be gone, but
as the error string for both adapters has been set, it was
not cleared

for parentassigngrp cycles:

1. create two usb adapters that have each other as parentassigngrp
2. change the parentassignrp of one of the adapters

now the cycle should be gone, but
as the error string for both adapters has been set, it was
not cleared

Also don't overwrite errors and be able to clear specific error types

Signed-off-by: Christoph Ostarek <[email protected]>
(cherry picked from commit d1e13b8)
@christoph-zededa christoph-zededa force-pushed the 12.0-stable_clear_err_on_usb_collision branch from d91b31c to 1b8e10d Compare September 16, 2024 09:49
@christoph-zededa
Copy link
Contributor Author

Could you please take the commit hash from the master branch, not from the original feature branch?

done

Copy link
Member

@OhmSpectator OhmSpectator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ignore the Yetus complaints, as the commit cherry-picked one-to-one.
Running the tests

@OhmSpectator OhmSpectator marked this pull request as ready for review September 16, 2024 10:04
@eriknordmark eriknordmark merged commit 77c2f13 into lf-edge:12.0-stable Sep 16, 2024
30 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants