/snapcraft

options: fix core-dynamic-linker on ppc64el/s390x #1600

Merged
merged 2 commits into from Oct 11, 2017

Conversation

Reviewers

@elopio elopio

@kyrofa kyrofa

Assignees

@cjwatson cjwatson

Labels
None yet
Projects
17.10 (awaiting triage)
Milestone
  2.35
4 participants
@cjwatson @elopio @kyrofa @sergiusens
@cjwatson
Contributor

cjwatson commented Oct 10, 2017

ppc64el and s390x had leading slashes on their settings for
core-dynamic-linker. In some cases this caused snapcraft to
incorrectly believe that the core snap was not installed, as the target
of the symlink on the host system couldn't be resolved within the core
snap.

LP: #1722521

cjwatson added some commits Oct 10, 2017

@cjwatson
options: fix core-dynamic-linker on ppc64el/s390x 
ppc64el and s390x had leading slashes on their settings for
`core-dynamic-linker`.  In some cases this caused snapcraft to
incorrectly believe that the core snap was not installed, as the target
of the symlink on the host system couldn't be resolved within the core
snap.

LP: #1722521
70a1692
@cjwatson
Fix test isolation error
9b6e366
@kyrofa

kyrofa approved these changes Oct 10, 2017
View changes

Sorry about that @cjwatson, thanks for the fix!

snapcraft/tests/project_loader/test_config.py
@@ -1626,6 +1626,7 @@ def test_config_stage_environment_confinement_classic(self):
'snapcraft._options.ProjectOptions.get_core_dynamic_linker')
mock_core_dynamic_linker = patcher.start()
mock_core_dynamic_linker.return_value = dynamic_linker
+ self.addCleanup(patcher.stop)
@elopio

elopio Oct 10, 2017

Member

good catch there, thank you.

@sergiusens sergiusens added this to the 2.35 milestone Oct 11, 2017

@sergiusens sergiusens assigned cjwatson Oct 11, 2017

@sergiusens sergiusens merged commit 1016c70 into snapcore:master Oct 11, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@cjwatson cjwatson deleted the cjwatson:fix-core-dl-paths branch Oct 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment