floppym 15/02/14 02:27:33 Modified: timezone-data-2015a.ebuild ChangeLog Log: If /etc/localtime is a symlink, don't replace it; this breaks systemd-timedated timezone reporting. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.2 sys-libs/timezone-data/timezone-data-2015a.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild?r1=1.1&r2=1.2 Index: timezone-data-2015a.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- timezone-data-2015a.ebuild 14 Feb 2015 02:07:46 -0000 1.1 +++ timezone-data-2015a.ebuild 14 Feb 2015 02:27:33 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild,v 1.1 2015/02/14 02:07:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild,v 1.2 2015/02/14 02:27:33 floppym Exp $ EAPI="4" @@ -139,9 +139,12 @@ elog "Your ${etc_lt} has been reset to Factory; enjoy!" tz="Factory" fi - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + if [[ -L ${etc_lt} ]]; then + einfo "Skipping symlinked ${etc_lt}" + else + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + fi } pkg_postinst() { 1.321 sys-libs/timezone-data/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.321&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.321&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.320&r2=1.321 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- ChangeLog 14 Feb 2015 02:07:46 -0000 1.320 +++ ChangeLog 14 Feb 2015 02:27:33 -0000 1.321 @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.320 2015/02/14 02:07:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.321 2015/02/14 02:27:33 floppym Exp $ + + 14 Feb 2015; Mike Gilbert <[email protected]> timezone-data-2015a.ebuild: + If /etc/localtime is a symlink, don't replace it; this breaks systemd- + timedated timezone reporting. *timezone-data-2015a (14 Feb 2015)
