Don't copy libraries that are already in prime. #580

Merged
merged 4 commits into from Jun 24, 2016

Conversation

Projects
None yet
2 participants
Member

kyrofa commented Jun 17, 2016

Currently snapcraft is fooled by relative rpaths and copies linked libraries, even if they've already been primed. This PR fixes LP: #1570895 and stops that by checking each library path to ensure it hasn't already been primed before doing so.

Don't copy libraries that are already in prime.
Currently snapcraft is fooled by relative rpaths and copies linked
libraries, even if they've already been primed. This commit stops that
by checking each library path to ensure it hasn't already been primed
before doing so.

LP: #1570895

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
integration_tests/test_rpath.py
@@ -0,0 +1,43 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd
@sergiusens

sergiusens Jun 18, 2016

Collaborator

2016 is the current year. Stop living in the past 👅

@kyrofa

kyrofa Jun 20, 2016

Member

This was terrible at the very beginning of the year. I kept feeling like it was 2015, so it was fine to see it. Then in, say, February, I started catching files that contained 2015 and putting 2016 in there. Now we're like halfway through the year, and I've apparently started assuming that all the copyrights say 2016 already 😛 .

@kyrofa

kyrofa Jun 20, 2016

Member

Fixed.

Update copyright year.
Signed-off-by: Kyle Fazzari <kyle@canonical.com>
Collaborator

sergiusens commented Jun 21, 2016

ok to test

Member

kyrofa commented Jun 24, 2016

retest this please.

@sergiusens sergiusens merged commit 00e37e5 into snapcore:master Jun 24, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.008%) to 96.166%
Details

@kyrofa kyrofa deleted the kyrofa:bugfix/1570895/relative_rpath branch Jun 27, 2016

kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017

Don't copy libraries that are already in prime. (#580)
Currently snapcraft is fooled by relative rpaths and copies linked
libraries, even if they've already been primed. This commit stops that
by checking each library path to ensure it hasn't already been primed
before doing so.

LP: #1570895

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment