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

Error return in failed probe (Fixes #887) #890

Merged

Conversation

rewolff
Copy link
Contributor

@rewolff rewolff commented Mar 21, 2020

Separate pull request for separate issue. On error in probe, the 1.6 version did not error out. This seems due to wanting to save a couple of lines that didn't work out. I added the two necessary lines.

@rewolff
Copy link
Contributor Author

rewolff commented Mar 21, 2020

Nightwalker, I messed things up, it seems. I didn't do what I wanted to do. Can you get this fixed, integrated for me, or do you want me to try to fix it again?

@Nightwalker-87 Nightwalker-87 self-requested a review March 21, 2020 18:13
@Nightwalker-87 Nightwalker-87 added this to the v1.6.1 milestone Mar 21, 2020
@Nightwalker-87
Copy link
Member

@rewolff: Don't bother about this too much. I had some troubles with proper merging on the develop branch just after Release v1.6.0 which turned out to be solved by now.

I'll rebase this one for you and suggest that you move over to the develop branch for your ongoing contributions as soon as these PRs are through. Don't worry too much about the tavis CI build fail. macOS testing in travis still seems to be messed up - damn it. (╯°□°)╯︵ ┻━┻

@Nightwalker-87 Nightwalker-87 changed the title Error return in failed probe Error return in failed probe (Fixes #887) Mar 21, 2020
@Nightwalker-87 Nightwalker-87 linked an issue Mar 21, 2020 that may be closed by this pull request
@Nightwalker-87 Nightwalker-87 merged commit 33ac8da into stlink-org:develop Mar 21, 2020
@Nightwalker-87
Copy link
Member

@rewolff: Thanks.

@stlink-org stlink-org locked as resolved and limited conversation to collaborators May 6, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

STLink in error state does not abort the program.
2 participants