Preserve directory structure in PRESERVED_FILES_DIR to avoid

filename collisions. Submitted by: des
svn path=/head/; revision=114565
2003-05-03 06:35:19 +00:00 · 2003-05-03 06:35:19 +00:00 · f3fff89357 · 2020-12-20 02:59:44 +00:00
commit f3fff89357
parent f92039a1fc
1 changed files with 2 additions and 2 deletions
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@ -656,8 +656,8 @@ do_install_and_rm () {
  case "${PRESERVE_FILES}" in
  [Yy][Ee][Ss])
    if [ -f "${3}/${2##*/}" ]; then
-      mkdir -p ${PRESERVE_FILES_DIR}
-      cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}
+      mkdir -p ${PRESERVE_FILES_DIR}/${2%/*}
+      cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*}
    fi
    ;;
  esac