Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Fix environment variable handling #229
Conversation
|
This can probably be refactored some more to not need |
kyrofa
reviewed
Jan 13, 2016
| + 'foo/usr/lib/x86_64-linux-gnu/pkgconfig:foo/usr/share/pkgconfig:' | ||
| + 'foo/usr/local/lib/pkgconfig:' | ||
| + 'foo/usr/local/lib/x86_64-linux-gnu/pkgconfig:' | ||
| + 'foo/usr/local/share/pkgconfig:$PKG_CONFIG_PATH' in environment) |
kyrofa
Jan 13, 2016
Member
Are you actually wanting to test the ordering here, or do you only really only want to test that each of these are included in PKG_CONFIG_PATH? If you're not wanting to test the order, this test is perhaps overly fragile. That goes for most of these assertions.
sergiusens
Jan 13, 2016
Collaborator
Well I also want to test that the output is correct and no missing colon gets in there. The order is fixed though (and should be as it determines the search order too).
kyrofa
Jan 13, 2016
Member
Well I also want to test that the output is correct and no missing colon gets in there.
You can do this without testing the order of them.
The order is fixed though (and should be as it determines the search order too).
Good enough for me. Just wanted to make sure.
|
Yeah this looks good to me! |
kyrofa
reviewed
Jan 13, 2016
| + patcher = unittest.mock.patch('snapcraft.common.get_arch_triplet') | ||
| + mock_arch = patcher.start() | ||
| + mock_arch.return_value = 'x86_64-linux-gnu' | ||
| + self.addCleanup(patcher.stop) |
|
I am at a point where the only thing failing is ROS. Let's see how this goes. |
|
Everything builds now; most things built work too |
|
|
|
I did a rebase of these onto the catkin one and it all works great. |
added a commit
that referenced
this pull request
Jan 15, 2016
sergiusens
merged commit 90075d0
into
snapcore:master
Jan 15, 2016
sergiusens
deleted the
sergiusens:env-fixes
branch
Jan 15, 2016
pushed a commit
to kalikiana/snapcraft
that referenced
this pull request
Apr 6, 2017
sergiusens commentedJan 13, 2016
Environment variables now correctly point to stagedir and snapdir and
don't expose the internal installdir paths for a part.
This required an intermediate change in the handling of stage-packages
but it also gives it a semantic meaning by unpacking everything into
the staging directory. Future work can make the handling of
stage-package more transactional or in a single shot.
LP: #1531481