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

bear: fix wrapper detection patch by checking result of find_executable #53712

Merged
merged 1 commit into from Jun 11, 2019

Conversation

liff
Copy link
Contributor

@liff liff commented Jan 9, 2019

Motivation for this change

With the wrapper detection patch, if a build invokes an executable that cannot be found in PATH by find_executable, bear will fail with an AttributeError in os.path.realpath.

This can happen if the build invokes some project-local tool or command, like ./build-something.

Instead of calling using the result of find_executable directly, first check whether the executable was found and fall back to original Bear behavior if it was not.

The problem can be easily reproduced like this, for example:

cd /tmp \
    && mkdir -p test \
    && echo -e 'all:\n\t./command' > test/Makefile \
    && echo '#!/bin/sh\necho hello' > test/command \
    && chmod +x test/command \
    && bear make -C test
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

With the wrapper detection patch, if a build invokes an executable that cannot
be found in PATH by `find_executable`, bear will fail with an `AttributeError`
in `os.path.realpath`.

This can happen if the build invokes some project-local tool or command, like
`./build-something`.

Instead of calling using the result of `find_executable` directly, first check
whether the executable was found and fall back to original Bear behavior if
it was not.
@liff
Copy link
Contributor Author

liff commented Jan 17, 2019

Ping @vcunat, @babariviere since this hasn’t got any reviewers assigned.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/17

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM 👍

@fpletz fpletz merged commit fdd75fc into NixOS:master Jun 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants