Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged

Conversation

kyrofa
Copy link
Contributor

@kyrofa 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

@come-maiz
Copy link
Contributor

I find your lack of tests disturbing :)

@kyrofa kyrofa force-pushed the bugfix/1534800/stage_packages_clobbering branch from 70d2437 to 5bfb7f5 Compare January 15, 2016 20:05
@kyrofa
Copy link
Contributor Author

kyrofa commented Jan 15, 2016

@ElOpio why, what are you talking about? cough

@sergiusens
Copy link
Collaborator

@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'

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>
@kyrofa kyrofa force-pushed the bugfix/1534800/stage_packages_clobbering branch from 5bfb7f5 to a9777ce Compare January 15, 2016 21:16
@kyrofa
Copy link
Contributor Author

kyrofa commented Jan 15, 2016

@sergiusens fixed, I believe.

@come-maiz
Copy link
Contributor

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

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

Always migrate files, even if they already exist.
@sergiusens sergiusens merged commit 11b79f1 into canonical:master Jan 16, 2016
@sergiusens
Copy link
Collaborator

👍

@kyrofa kyrofa deleted the bugfix/1534800/stage_packages_clobbering branch January 21, 2016 14:23
smoser pushed a commit to smoser/snapcraft that referenced this pull request Sep 14, 2016
kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017
…kages_clobbering

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

Successfully merging this pull request may close these issues.

None yet

3 participants