diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2015-02-14 02:27:33 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2015-02-14 02:27:33 +0000 |
| commit | ac33b174d357686f8bcc563c603aaa8644ddb87f (patch) | |
| tree | 41798c3adfc9682e6c2fe52f73a728cd2207f8b1 /sys-libs | |
| parent | Move custom autogen logic to the ebuild and call eautoreconf. (diff) | |
| download | gentoo-2-ac33b174d357686f8bcc563c603aaa8644ddb87f.tar.gz gentoo-2-ac33b174d357686f8bcc563c603aaa8644ddb87f.tar.bz2 gentoo-2-ac33b174d357686f8bcc563c603aaa8644ddb87f.zip | |
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)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/timezone-data/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2015a.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index 9ba9a99ebf52..2ce9a425d73c 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -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 <floppym@gentoo.org> 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) diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild index 8d4607e16d18..795dc975af01 100644 --- a/sys-libs/timezone-data/timezone-data-2015a.ebuild +++ b/sys-libs/timezone-data/timezone-data-2015a.ebuild @@ -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 @@ pkg_config() { 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() { |