| Summary: | net-nds/openldap: merge-usr collision for /usr/lib/systemd/system/slapd.service | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | dani-g5x <dani-5g> |
| Component: | Current packages | Assignee: | Gentoo LDAP project <ldap-bugs> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | Normal | ||
| Version: | unspecified | ||
| Hardware: | AMD64 | ||
| OS: | Linux | ||
| See Also: | https://bugs.gentoo.org/show_bug.cgi?id=885457 | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 690294 | ||
| Attachments: | output of equery f openldap | ||
Please include 'equery f openldap' output too. Thanks! (In reply to Sam James from comment #1) > Please include 'equery f openldap' output too. Thanks! I would like to, but I can't because the output of the command, surpasses the maximum permitted characters (In reply to Sam James from comment #1) > Please include 'equery f openldap' output too. Thanks! And I can't post links, I have to wait 24 hours after I created the account. Created attachment 849507 [details]
output of equery f openldap
Please try >= -r4, actually. The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a18977dfe87fa97e472701a98a7e1640c5176f7 commit 3a18977dfe87fa97e472701a98a7e1640c5176f7 Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2023-01-30 16:43:19 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2023-01-30 16:44:29 +0000 net-nds/openldap: adjust systemd unit install logic Only install slapd.service when USE=systemd; it has Type=notify and is therefore uselesss without sd_notify. Also remove the upstream unit file to prevent weirdness with split-usr. Closes: https://bugs.gentoo.org/892627 Signed-off-by: Mike Gilbert <floppym@gentoo.org> net-nds/openldap/openldap-2.6.3-r6.ebuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) |
merge-usr --dryrun INFO: Migrating files from '/bin' to '/usr/bin' INFO: Skipping symlink '/bin/awk'; '/usr/bin/awk' already exists INFO: No problems found for '/bin' INFO: Migrating files from '/sbin' to '/usr/bin' INFO: No problems found for '/sbin' INFO: Migrating files from '/usr/sbin' to '/usr/bin' INFO: No problems found for '/usr/sbin' INFO: Migrating files from '/lib' to '/usr/lib' ERROR: Conflict for file '/lib/systemd/system/slapd.service': [Errno 17] File exists: '/usr/lib/systemd/system/slapd.service' ERROR: Leaving '/lib' as a directory due to prior errors INFO: Migrating files from '/lib64' to '/usr/lib64' INFO: No problems found for '/lib64' Reproducible: Always Steps to Reproduce: 1.sudo emerge sys-apps/merge-usr 2.merge-usr --dryrun Actual Results: merge-usr --dryrun INFO: Migrating files from '/bin' to '/usr/bin' INFO: Skipping symlink '/bin/awk'; '/usr/bin/awk' already exists INFO: No problems found for '/bin' INFO: Migrating files from '/sbin' to '/usr/bin' INFO: No problems found for '/sbin' INFO: Migrating files from '/usr/sbin' to '/usr/bin' INFO: No problems found for '/usr/sbin' INFO: Migrating files from '/lib' to '/usr/lib' ERROR: Conflict for file '/lib/systemd/system/slapd.service': [Errno 17] File exists: '/usr/lib/systemd/system/slapd.service' ERROR: Leaving '/lib' as a directory due to prior errors INFO: Migrating files from '/lib64' to '/usr/lib64' INFO: No problems found for '/lib64' Expected Results: It shouldn't show any conflict. emerge --info openldap ================================================================= Package Settings ================================================================= net-nds/openldap-2.6.3-r3::gentoo was built with the following: USE="cleartext crypt ipv6 samba ssl syslog systemd -argon2 -autoca -cxx -debug -experimental -gnutls -iodbc -kerberos -kinit -minimal -odbc -overlays -pbkdf2 -perl -sasl (-selinux) -sha2 -smbkrb5passwd -static-libs -tcpd -test" ABI_X86="(64) -32 (-x32)" CFLAGS="-march=native -O1 -pipe -DOPENSSL_NO_MD2" CXXFLAGS="-march=native -O1 -pipe" FEATURES="distlocks fixlafiles usersandbox binpkg-dostrip network-sandbox parallel-fetch usersync ebuild-locks ipc-sandbox xattr userfetch buildpkg config-protect-if-modified strict downgrade-backup protect-owned sfperms qa-unresolved-soname-deps unmerge-logs unmerge-orphans multilib-strict buildpkg-live merge-sync pid-sandbox binpkg-docompress unknown-features-warn preserve-libs assume-digests userpriv binpkg-multi-instance binpkg-logs news sandbox"