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: fix for multi-arch virtual-packages #3084

Merged
merged 2 commits into from Apr 23, 2020

Conversation

cjp256
Copy link
Contributor

@cjp256 cjp256 commented Apr 23, 2020

wine-devel-i386 does not have the explicit ":i386" tag, but
the virtual package is provided by "wine-devel-i386:i386".

Account for this possibility by resolving the package and
checking the architecture first, if no arch is specified by
the user.

  • Revert the use of or_dependendencies back to target_versions
    now that target_arch should correct the previously faulty
    behavior (where target_versions ended up switching to the
    incorrect arch after following an :any package).

  • Fix apt.Package.architectures to architectures() method call.

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?

@cjp256 cjp256 force-pushed the fix-multi-arch branch 2 times, most recently from 5938069 to 65cc0de Compare April 23, 2020 18:37
wine-devel-i386 does not have the explicit ":i386" tag, but
the virtual package is provided by "wine-devel-i386:i386".

Account for this possibility by resolving the package and
checking the architecture first, if no arch is specified by
the user.

- Revert the use of or_dependendencies back to target_versions
now that target_arch should correct the previously faulty
behavior (where target_versions ended up switching to the
incorrect arch after following an :any package).

- Fix apt.Package.architectures to architectures() method call.

Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
@sergiusens sergiusens merged commit caf0e0c into canonical:master Apr 23, 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