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

storeapi: Use structured data for the conflicted current value #2316

Merged
merged 2 commits into from Oct 4, 2018

Conversation

sparkiegeek
Copy link
Contributor

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • If this is a bugfix. Have you checked that there is a bug report open for the issue you are trying to fix on bug reports?
  • If this is a new feature. Have you discussed the design on the forum?
  • Have you successfully run ./runtests.sh static?
  • Have you successfully run ./runtests.sh tests/unit?

Part of the fix for lp:1795416 when there's a conflict with the metadata, snapcraft should use the structured data coming from the conflict error in the store, instead of the message.

The fake store here is updated to the WiP branch I have for the store, which will remove the user supplied values from the error's message.

Instead of relying on the Store's value being in the mssage of the
error use the structured data found in 'extra' instead. Also updated
the fake store to match reality.
@sergiusens
Copy link
Collaborator

@facundobatista @matiasb since you guys worked on the original code, do you mind taking a quick peek at this?

Copy link
Contributor

@facundobatista facundobatista left a comment

Choose a reason for hiding this comment

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

Looks ok!

@sergiusens sergiusens merged commit f9203ca into canonical:master Oct 4, 2018
sergiusens pushed a commit to sergiusens/snapcraft that referenced this pull request Oct 4, 2018
…ical#2316)

Instead of relying on the Store's value being in the message of the
error use the structured data found in 'extra' instead. Also updated
the fake store to match reality.

LP: #1795416
@sparkiegeek sparkiegeek deleted the conflict-errors-structured branch October 5, 2018 10:10
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.

None yet

3 participants