]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
freebsd-update: handle file -> directory on upgrade
authorEd Maste <emaste@FreeBSD.org>
Wed, 27 Sep 2023 13:36:33 +0000 (09:36 -0400)
committerEd Maste <emaste@FreeBSD.org>
Wed, 27 Sep 2023 19:23:08 +0000 (15:23 -0400)
commitf6d37c9ca13f8ab0ef32cf5344daecb8122d1e85
tree1f171232052244f143867698586661d943d0c7ce
parentc362fe939f6fe52056fb7506be9e5cbd0a5ef60b
freebsd-update: handle file -> directory on upgrade

Upgrading from FreeBSD 13.2 to 14.0 failed with
  install: ///usr/include/c++/v1/__string exists but is not a directory
because __string changed from a file to a directory with an LLVM
upgrade.

Now, remove the existing file when the type conflicts.  Note that this
is only an interim fix to facilitate upgrades from 13.2 for 14.0 BETA
testing.  This change does not handle the directory -> file case and
further work is needed.

PR: 273661
Reviewed by: dim, gordon
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41893
usr.sbin/freebsd-update/freebsd-update.sh