Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 830177 - app-editors/vim-core-8.2.3741 file collision with app-editors/vim-8.2.3741
Summary: app-editors/vim-core-8.2.3741 file collision with app-editors/vim-8.2.3741
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: Normal normal (vote)
Assignee: Vim Maintainers
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2021-12-28 17:33 UTC by Adam
Modified: 2022-03-02 19:31 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Adam 2021-12-28 17:33:00 UTC
One of my systems is refusing to install both current versions of vim-core and vim.

It appears this situation occurs due to app-editors/vim having the 'minimal' use flag set, while vim-core doesn't (vim-core is being pulled in by other packages)

It also appears that if both vim and vim-core have the 'minimal' USE flag set, the collision doesn't occur.

However, this collision seems to be a new issue which wasn't present until 8.2.3741 came along.



Reproducible: Always

Steps to Reproduce:
emerge -uDNqv @world

Actual Results:  
* 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.



# emerge --info
Portage 3.0.28 (python 3.9.9-final-0, default/linux/amd64/17.1, gcc-11.2.0, glibc-2.33-r7, 5.10.76-gentoo-r1 x86_64)
=================================================================
System uname: Linux-5.10.76-gentoo-r1-x86_64-Intel-R-_Core-TM-_i7-2600K_CPU_@_3.40GHz-with-glibc2.33
KiB Mem:    16367420 total,   9299412 free
KiB Swap:   33554424 total,  33554424 free
Timestamp of repository gentoo: Tue, 28 Dec 2021 11:45:01 +0000
Head commit of repository gentoo: a35effe5a8834459e09b5332c2677252ac670b2a
Timestamp of repository qownnotes-overlay: Tue, 28 Dec 2021 08:51:34 +0000
Head commit of repository qownnotes-overlay: fe47ba0b24817579b56f158a3e1307b9543ae961

Timestamp of repository steam-overlay: Sat, 25 Dec 2021 23:55:55 +0000
Head commit of repository steam-overlay: 12fa5cbd7651fdda1af1f4f4c1d0fddb0bbc9c86

Head commit of repository librewolf: 96d8ae7d4fa80c32f5a45a382a9b594d6d9768e5

sh bash 5.1_p8
ld GNU ld (Gentoo 2.37_p1 p0) 2.37
distcc 3.4 x86_64-pc-linux-gnu [disabled]
ccache version 4.4.2 [disabled]
app-misc/pax-utils:        1.3.3::gentoo
app-shells/bash:           5.1_p8::gentoo
dev-java/java-config:      2.3.1::gentoo
dev-lang/perl:             5.34.0-r3::gentoo
dev-lang/python:           2.7.18_p13::gentoo, 3.8.12_p1::gentoo, 3.9.9::gentoo, 3.10.0_p1::gentoo
dev-lang/rust:             1.56.1::gentoo
dev-util/ccache:           4.4.2::gentoo
dev-util/cmake:            3.21.4::gentoo
dev-util/meson:            0.59.4::gentoo
sys-apps/baselayout:       2.7-r3::gentoo
sys-apps/openrc:           0.44.10::gentoo
sys-apps/sandbox:          2.25::gentoo
sys-devel/autoconf:        2.13-r1::gentoo, 2.71-r1::gentoo
sys-devel/automake:        1.16.4::gentoo
sys-devel/binutils:        2.37_p1::gentoo
sys-devel/binutils-config: 5.4::gentoo
sys-devel/clang:           13.0.0::gentoo
sys-devel/gcc:             10.3.0-r2::gentoo, 11.2.0::gentoo
sys-devel/gcc-config:      2.4::gentoo
sys-devel/libtool:         2.4.6-r6::gentoo
sys-devel/lld:             13.0.0::gentoo
sys-devel/llvm:            13.0.0::gentoo
sys-devel/make:            4.3::gentoo
sys-kernel/linux-headers:  5.15-r1::gentoo (virtual/os-headers)
sys-libs/glibc:            2.33-r7::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: rsync
    sync-uri: rsync://192.168.24.254/gentoo-portage
    priority: -1000
    sync-rsync-verify-jobs: 1
    sync-rsync-verify-max-age: 24
    sync-rsync-verify-metamanifest: yes
    sync-rsync-extra-opts: 

localrepo
    location: /var/db/repos/localrepo
    masters: gentoo

qownnotes-overlay
    location: /var/db/repos/qownnotes-overlay
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/qownnotes-overlay.git
    masters: gentoo

steam-overlay
    location: /var/db/repos/steam-overlay
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/steam-overlay.git
    masters: gentoo

eclipse
    location: /var/lib/layman/eclipse
    sync-type: laymansync
    sync-uri: https://github.com/gentoo/eclipse-overlay.git
    masters: gentoo
    priority: 50

flatpak-overlay
    location: /var/lib/layman/flatpak-overlay
    sync-type: laymansync
    sync-uri: https://github.com/fosero/flatpak-overlay.git
    masters: gentoo
    priority: 50

guru
    location: /var/lib/layman/guru
    sync-type: laymansync
    sync-uri: https://anongit.gentoo.org/git/repo/proj/guru.git
    masters: gentoo
    priority: 50

librewolf
    location: /var/db/repos/librewolf
    sync-type: git
    sync-uri: https://gitlab.com/librewolf-community/browser/gentoo.git
    masters: gentoo
    priority: 50

lto-overlay
    location: /var/lib/layman/lto-overlay
    sync-type: laymansync
    sync-uri: https://github.com/InBetweenNames/gentooLTO.git
    masters: gentoo
    priority: 50

sft
    location: /var/lib/layman/sft
    sync-type: laymansync
    sync-uri: https://github.com/SFTtech/gentoo-overlay.git
    masters: gentoo
    priority: 50

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O3 -fgraphite-identity -floop-nest-optimize -fdevirtualize-at-ltrans -fipa-pta -fno-semantic-interposition -flto=4 -fuse-linker-plugin -falign-functions=32 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=native -O3 -fgraphite-identity -floop-nest-optimize -fdevirtualize-at-ltrans -fipa-pta -fno-semantic-interposition -flto=4 -fuse-linker-plugin -falign-functions=32 -pipe"
DISTDIR="/var/cache/distfiles"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-march=native -O3 -fgraphite-identity -floop-nest-optimize -fdevirtualize-at-ltrans -fipa-pta -fno-semantic-interposition -flto=4 -fuse-linker-plugin -falign-functions=32 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-march=native -O3 -fgraphite-identity -floop-nest-optimize -fdevirtualize-at-ltrans -fipa-pta -fno-semantic-interposition -flto=4 -fuse-linker-plugin -falign-functions=32 -pipe"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_CA.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
PKGDIR="/var/cache/binpkgs"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
SHELL="/bin/bash"
USE="X a52 aac acl acpi activities alsa amd64 bluetooth branding browser-integration bzip2 cairo cdda cdr cli crypt cuda cups dbus declarative dri dts dvd dvdr elogind emboss encode exif fftw flac fortran frei0r gdbm gif gtk handbook iconv icu id3tag jpeg kde kipi kwallet lcms ldap libglvnd libnotify libtirpc lto mad mng mp3 mp4 mpeg multilib ncurses networkmanager nfsidmap nls nptl ogg opencl opengl openmp pam pango pcre pdf pgo phonon plasma png policykit ppds pulseaudio qml qt5 readline scanner screencast sddm sdl seccomp shout snmp speex spell split-usr ssl startup-notification svg theora tiff truetype udev udisks unicode upower usb vaapi vdpau vorbis vpx vulkan wallpapers wayland webp widgets wxwidgets x264 xattr xcb xml xv xvid xvmc zlib" ABI_X86="64" ADA_TARGET="gnat_2020" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="pc" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="AMDGPU" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-3 php7-4" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9 python3_8" RUBY_TARGETS="ruby26 ruby27" USERLAND="GNU" VIDEO_CARDS="amdgpu radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EMERGE_DEFAULT_OPTS, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, MAKEOPTS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-12-28 19:56:13 UTC
@dpark, would you mind looking at this? Thanks!
Comment 2 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2022-01-26 02:27:58 UTC
(In reply to Sam James from comment #1)
> @dpark, would you mind looking at this? Thanks!

ping?
Comment 3 Dongsu Park 2022-01-26 10:21:48 UTC
Thanks for the reminder.
Will soon try to have a look.
Comment 4 Dongsu Park 2022-01-27 17:00:01 UTC
Yes, I was able to reproduce issue.

When I wrote the code, I have not considered the case that vim-core has a different minimal USE flag from vim.
To fix the installation conflict, I filed a PR https://github.com/gentoo/gentoo/pull/23986 .
With that, at least installation conflicts like that would be gone.

Not sure if that would resolve all issues that happen with vim[minimal] and vim-core[-minimal] .
Users would get still some warnings at runtime.
Not sure how we can fix those.
Comment 5 Larry the Git Cow gentoo-dev 2022-02-18 03:06:53 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c6279825a758f660237211dfcdfd83399887f4

commit e4c6279825a758f660237211dfcdfd83399887f4
Author:     Dongsu Park <dpark@linux.microsoft.com>
AuthorDate: 2022-01-27 16:28:09 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-02-18 02:53:32 +0000

    app-editors/vim-core: skip installing defaults.vim when installed
    
    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>
    Closes: https://github.com/gentoo/gentoo/pull/23986
    Signed-off-by: Sam James <sam@gentoo.org>

 app-editors/vim-core/vim-core-8.2.0814.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3428.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3567.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3582.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3669.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3741.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.3950.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-9999.ebuild     | 10 +++++++---
 8 files changed, 56 insertions(+), 24 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49adc5f0272e40ac608a89d268ee12811fcca384

commit 49adc5f0272e40ac608a89d268ee12811fcca384
Author:     Dongsu Park <dpark@linux.microsoft.com>
AuthorDate: 2022-01-27 16:23:03 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-02-18 02:53:29 +0000

    app-editors/vim: install defaults.vim only if the file is not installed
    
    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>
    Signed-off-by: Sam James <sam@gentoo.org>

 app-editors/vim/vim-8.2.0814-r100.ebuild | 6 ++++--
 app-editors/vim/vim-8.2.3428-r1.ebuild   | 6 ++++--
 app-editors/vim/vim-8.2.3567.ebuild      | 6 ++++--
 app-editors/vim/vim-8.2.3582.ebuild      | 6 ++++--
 app-editors/vim/vim-8.2.3669.ebuild      | 6 ++++--
 app-editors/vim/vim-8.2.3741.ebuild      | 6 ++++--
 app-editors/vim/vim-8.2.3950.ebuild      | 6 ++++--
 app-editors/vim/vim-9999.ebuild          | 6 ++++--
 8 files changed, 32 insertions(+), 16 deletions(-)
Comment 6 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2022-02-18 03:19:17 UTC
(In reply to Dongsu Park from comment #4)
> Yes, I was able to reproduce issue.
> 
> When I wrote the code, I have not considered the case that vim-core has a
> different minimal USE flag from vim.
> To fix the installation conflict, I filed a PR
> https://github.com/gentoo/gentoo/pull/23986 .
> With that, at least installation conflicts like that would be gone.
> 
> Not sure if that would resolve all issues that happen with vim[minimal] and
> vim-core[-minimal] .
> Users would get still some warnings at runtime.
> Not sure how we can fix those.

Thank you!
Comment 7 Larry the Git Cow gentoo-dev 2022-02-18 17:56:58 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9829038751fab208ed07a97a35fa3168edae93

commit ed9829038751fab208ed07a97a35fa3168edae93
Author:     Dongsu Park <dpark@linux.microsoft.com>
AuthorDate: 2022-02-18 11:27:49 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-02-18 17:56:35 +0000

    app-editors/vim-core: fix conflicts in 8.2.{4285,4328}
    
    We fixed defaults.vim installation conflicts in
    e4c6279825a758f660237211dfcdfd83399887f4, but not for 8.2.4285 and
    8.2.4328. Fix the issue for the versions.
    
    Bug: https://bugs.gentoo.org/830177
    Signed-off-by: Dongsu Park <dpark@linux.microsoft.com>
    Closes: https://github.com/gentoo/gentoo/pull/24247
    Signed-off-by: Sam James <sam@gentoo.org>

 app-editors/vim-core/vim-core-8.2.4285.ebuild | 10 +++++++---
 app-editors/vim-core/vim-core-8.2.4328.ebuild | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d47914d37a74bf090f7c5fab43bb8f5084b9ae

commit 90d47914d37a74bf090f7c5fab43bb8f5084b9ae
Author:     Dongsu Park <dpark@linux.microsoft.com>
AuthorDate: 2022-02-18 11:27:16 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-02-18 17:56:32 +0000

    app-editors/vim: fix conflicts in 8.2.{4285,4328}
    
    We fixed defaults.vim installation conflicts in
    49adc5f0272e40ac608a89d268ee12811fcca384, but not for 8.2.4285 and
    8.2.4328. Fix the issue for the versions.
    
    Bug: https://bugs.gentoo.org/830177
    Signed-off-by: Dongsu Park <dpark@linux.microsoft.com>
    Signed-off-by: Sam James <sam@gentoo.org>

 app-editors/vim/vim-8.2.4285.ebuild | 6 ++++--
 app-editors/vim/vim-8.2.4328.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)