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

repo: always use host release and arch for Ubuntu #3006

Merged
merged 7 commits into from Apr 3, 2020

Conversation

cjp256
Copy link
Contributor

@cjp256 cjp256 commented Apr 1, 2020

  • Remove dependency of ProjectOptions parameter.

  • Update format_sources_list() tp query release arch/release
    separately.

Update tests accordingly.

Signed-off-by: Chris Patterson chris.patterson@canonical.com

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run ./runtests.sh static?
  • Have you successfully run ./runtests.sh tests/unit?

- Remove dependency of ProjectOptions parameter.

- Update format_sources_list() tp query release arch/release
  separately.

Update tests accordingly.

Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
sergiusens
sergiusens previously approved these changes Apr 1, 2020
def _format_sources_list(sources_list: str, *, deb_arch: str, release: str = "xenial"):
def _format_sources_list(sources_list: str):
release = os_release.OsRelease().version_codename()
deb_arch = snapcraft.ProjectOptions().deb_arch
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wonder if this can go away completely.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, i ditched $suffix and $prefix. I was originally going to wait on that, but it's here now. :D

Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
@cjp256 cjp256 closed this Apr 2, 2020
@cjp256 cjp256 reopened this Apr 2, 2020
sergiusens
sergiusens previously approved these changes Apr 2, 2020
@sergiusens
Copy link
Collaborator

btw, you have format issues

@cjp256
Copy link
Contributor Author

cjp256 commented Apr 3, 2020

Fixed

@sergiusens sergiusens merged commit 7045361 into canonical:master Apr 3, 2020
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

2 participants