Page MenuHomeFreeBSD
Files F115941380

D41893.id127864.diff
No OneTemporary
Actions

D41893.id127864.diff
View Options

Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -2909,7 +2909,13 @@
while read FPATH TYPE OWNER GROUP PERM FLAGS HASH LINK; do
case ${TYPE} in
d)
- # Create a directory
+ # Create a directory. A file may change to a directory
+ # on upgrade (PR273661). If that happens, remove the
+ # file first.
+ if [ -e "${BASEDIR}/${FPATH}" ] && \
+ ! [ -d "${BASEDIR}/${FPATH}" ]; then
+ rm -f -- "${BASEDIR}/${FPATH}"
+ fi
install -d -o ${OWNER} -g ${GROUP} \
-m ${PERM} ${BASEDIR}/${FPATH}
;;

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 4:41 PM (11 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17886388
Default Alt Text
D41893.id127864.diff (700 B)

Event Timeline