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

app-editors/vim,vim-core: Fix conflicts in installation of defaults.vim #23986

Closed
wants to merge 2 commits into from

Conversation

dongsupark
Copy link
Contributor

When app-editors/vim has minimal USE flag set, while app-editors/vim-core does not set that, installation of packages fails like that:

* This package will overwrite one or more files that may belong to other
 * packages (see list below).
 * 
 * Detected file collision(s):
 * 
 *      /usr/share/vim/vim82/defaults.vim
 * 
 * Searching all installed packages for file collisions...
 * 
 * Press Ctrl-C to Stop
 * 
 * app-editors/vim-8.2.3741:0::gentoo
 *      /usr/share/vim/vim82/defaults.vim
 * 
 * Package 'app-editors/vim-core-8.2.3741' NOT merged due to file
 * collisions. If necessary, refer to your elog messages for the whole
 * content of the above message.

To fix that, on the vim side, install defaults.vim only if the file is not installed already from vim-core.
On the vim-core side, do not install defaults.vim when the file is already installed from vim.

Install defaults.vim only if the file is not installed already from
vim-core. That's needed for avoiding conflicts between vim and vim-core.

Closes: https://bugs.gentoo.org/830177
Signed-off-by: Dongsu Park <dpark@linux.microsoft.com>
Do not install defaults.vim when the file is already installed
from vim. This is needed for avoiding installation conflicts between
vim and vim-core.

Closes: https://bugs.gentoo.org/830177
Signed-off-by: Dongsu Park <dpark@linux.microsoft.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @dongsupark
Areas affected: ebuilds
Packages affected: app-editors/vim, app-editors/vim-core

app-editors/vim: @gentoo/vim
app-editors/vim-core: @gentoo/vim

Linked bugs

Bugs linked: 830177


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jan 27, 2022
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-01-27 17:36 UTC
Newest commit scanned: cf0572c
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/b7b13563bc/output.html

@thesamesam
Copy link
Member

Thank you!

@dongsupark dongsupark deleted the dongsu/vim-fix-conflicts branch February 18, 2022 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
4 participants