/snapcraft

Always migrate files, even if they already exist. #236

Merged
merged 1 commit into from Jan 16, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@kyrofa @elopio @sergiusens
@kyrofa
Member

kyrofa commented Jan 15, 2016

This prevents files contained in a stage-package .deb from taking precedence over files of the same name produced in the part. The migration is done via hard linking, which means this doesn't add any noticeable delay.

LP: #1534800
@elopio
Member

elopio commented Jan 15, 2016

I find your lack of tests disturbing :)
@kyrofa
Member

kyrofa commented Jan 15, 2016

@elopio why, what are you talking about? cough
@sergiusens
Collaborator

sergiusens commented Jan 15, 2016

@kyrofa I think you want something closer to my pastebin

[Errno 17] File exists: '/home/travis/build/ubuntu-core/snapcraft/examples/ros/parts/roscore/install/usr/share/doc/libc6-dev/changelog.Debian.gz' -> '/home/travis/build/ubuntu-core/snapcraft/examples/ros/stage/usr/share/doc/libc6-dev/changelog.Debian.gz'
@kyrofa
Always migrate files, even if they already exist. 
This prevents files contained in a stage-package .deb from taking
precedence over files of the same name produced in the part. The
migration is done via hard linking, which means this doesn't add
any noticeable delay.

LP: #1534800

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
This commit was signed with a verified signature.
@kyrofa kyrofa Kyle Fazzari
GPG key ID: A7D23FB0E778DEDF Learn about signing commits

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.008%) to 90.259%
Details
a9777ce
@kyrofa
Member

kyrofa commented Jan 15, 2016

@sergiusens fixed, I believe.
@elopio
Member

elopio commented Jan 16, 2016

The test looks good to me. I'm not sure if it solves sergio's problem, so I'll leave it for him.

@sergiusens sergiusens referenced this pull request Jan 16, 2016

Merged

Add usr/bin to the shebang replace path #238

sergiusens added a commit that referenced this pull request Jan 16, 2016

@sergiusens
Merge pull request #236 from kyrofa/bugfix/1534800/stage_packages_clo… 
…bbering

Always migrate files, even if they already exist.
11b79f1

@sergiusens sergiusens merged commit 11b79f1 into snapcore:master Jan 16, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.008%) to 90.259%
Details
@sergiusens
Collaborator

sergiusens commented Jan 16, 2016

👍

@kyrofa kyrofa deleted the kyrofa:bugfix/1534800/stage_packages_clobbering branch Jan 21, 2016

smoser pushed a commit to smoser/snapcraft that referenced this pull request Sep 14, 2016

@hglkrijger
fix for bad unit test patch (#236)
9fa305b

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

@sergiusens
Merge pull request #236 from kyrofa/bugfix/1534800/stage_packages_clo… 
…bbering

Always migrate files, even if they already exist.
b9ca875
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment