Date: Wed, 22 May 2013 19:00:05 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250916 - head/usr.sbin/mergemaster Message-ID: <201305221900.r4MJ05eT019978@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Wed May 22 19:00:05 2013 New Revision: 250916 URL: http://svnweb.freebsd.org/changeset/base/250916 Log: Don't mess with /etc/localtime if it is a symlink. Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Wed May 22 18:26:12 2013 (r250915) +++ head/usr.sbin/mergemaster/mergemaster.sh Wed May 22 19:00:05 2013 (r250916) @@ -1327,7 +1327,7 @@ case "${NEED_PWD_MKDB}" in ;; esac -if [ -e "${DESTDIR}/etc/localtime" -a -z "${PRE_WORLD}" ]; then # Ignore if TZ == UTC +if [ -e "${DESTDIR}/etc/localtime" -a ! -L "${DESTDIR}/etc/localtime" -a -z "${PRE_WORLD}" ]; then # Ignore if TZ == UTC echo '' [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305221900.r4MJ05eT019978>