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.

Sign up for GitHub

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

Jump to bottom

fix(builtin): fix logic error in linker conflict resolution #1597

Merged
merged 1 commit into from
Jan 31, 2020
Merged

fix(builtin): fix logic error in linker conflict resolution #1597

merged 1 commit into from
Jan 31, 2020

Conversation

gregmagolan
Copy link
Collaborator

Fixes #1595.

The elif path in

            if mappings[k][0] == "runfiles":
                return True
            elif v[0] == "runfiles":
                return False

is now exercised by the linker integration tests.

PR Checklist

Please check if your PR fulfills the following requirements:

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature (please, look at the "Scope of the project" section in the README.md file)
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

@gregmagolan
fix(builtin): fix logic error in linker conflict resolution
f30d290 
Fixes bazel-contrib#1595. The `elif` path in
```
            if mappings[k][0] == "runfiles":
                return True
            elif v[0] == "runfiles":
                return False
```
is now exercised by the linker integration tests.
@gregmagolan gregmagolan mentioned this pull request Jan 31, 2020
Closed
@gregmagolan gregmagolan merged commit b864223 into bazel-contrib:master Jan 31, 2020
This was referenced May 23, 2022
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexeagle alexeagle alexeagle approved these changes

@soldair soldair Awaiting requested review from soldair

Assignees
No one assigned
Labels
bug cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Module Mapping Regression (conflicting mapping at ...)
3 participants
@gregmagolan @alexeagle @googlebot