]> 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>
Sun, 1 Oct 2023 16:33:03 +0000 (12:33 -0400)
commit774cc6348a50c13b952e9f36ef8395f9b48733db
treeafa7b85c36f119d01ebfdd905b050b3e9cc5c244
parentd9a61490b0988b1187ea169e538762f70dfaeb12
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

(cherry picked from commit f6d37c9ca13f8ab0ef32cf5344daecb8122d1e85)
usr.sbin/freebsd-update/freebsd-update.sh