Attachment 15154 Details for Bug 28190 – file.diff

[patch] file.diff

file.diff (text/plain), 1.24 KB, created by James Halstead on 2001-06-16 04:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Halstead

Created: 2001-06-16 04:30:02 UTC

Size: 1.24 KB

patch

obsolete

>--- mergemaster.sh.orig Fri Jun 15 00:41:45 2001
>+++ mergemaster.sh      Sat Jun 16 03:27:18 2001
>@@ -471,7 +471,7 @@
>     echo ' *** Press [Enter] or [Return] key to continue'
>     read ANY_KEY
>     unset ANY_KEY
>-    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
>+    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" |
>${PAGER}
>     echo ''
>     echo ' *** Press [Enter] or [Return] key to continue'
>     read ANY_KEY
>@@ -592,7 +592,7 @@
>       NEED_CAP_MKDB=yes
>       ;;
>     /etc/master.passwd)
>-      install -m 600 "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>+      install -c -m 600 "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>         [ -f "${1}" ] && rm "${1}"
>       NEED_PWD_MKDB=yes
>       DONT_INSTALL=yes
>@@ -651,7 +651,7 @@
> 
>     case "${DONT_INSTALL}" in
>     '')
>-      install -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>+      install -c -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>         [ -f "${1}" ] && rm "${1}"
>       ;;
>     *)
>@@ -664,7 +664,7 @@
>       NEED_MAKEDEV=yes
>       ;;
>     esac
>-    install -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>+    install -c -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
>       [ -f "${1}" ] && rm "${1}"
>   fi
>   return $?

Actions: View | Diff

Attachments on bug 28190: 15154