elf: search for host libraries within search paths #2909
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A regression was introduced with commit 76e8a3f which considered elf files on the host system to be valid. Additionally, since the host-found libraries were absolute paths, an os.path.join suffixing the search paths snapcraft cared about were ignored. A unit test which considers this scenario was added. LP: #1860766 Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Codecov Report
@@ Coverage Diff @@
## master #2909 +/- ##
=========================================
+ Coverage 87.9% 87.9% +<.01%
=========================================
Files 229 229
Lines 16517 16517
Branches 2548 2549 +1
=========================================
+ Hits 14519 14520 +1
+ Misses 1444 1443 -1
Partials 554 554
Continue to review full report at Codecov.
|
cjp256
previously approved these changes
Feb 4, 2020
snapcraft/internal/elf.py
Outdated
| if self._is_valid_elf(self.soname_path): | ||
| valid_search_paths = [p for p in self.search_paths if os.path.exists(p)] | ||
| in_search_paths = any( | ||
| [self.soname_path.startswith(p) for p in valid_search_paths] |
There was a problem hiding this comment.
Not that it matters here, but I think in this would be a good case for a generator (lose the list brackets):
any(self.soname_path.startswith(p) for p in valid_search_paths)
There was a problem hiding this comment.
I am a fan of generators in general
cjp256
approved these changes
Feb 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A regression was introduced with commit 76e8a3f
which considered elf files on the host system to be valid. Additionally, since
the host-found libraries were absolute paths, an os.path.join suffixing the
search paths snapcraft cared about were ignored.
A unit test which considers this scenario was added.
LP: #1860766
Signed-off-by: Sergio Schvezov sergio.schvezov@canonical.com
./runtests.sh static?./runtests.sh tests/unit?