diff options
author | Mike Frysinger <vapier@gentoo.org> | 2014-07-30 06:46:16 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2014-07-30 06:46:16 +0000 |
commit | fad1cac32ce3de49c56b713c93932b995c69b436 (patch) | |
tree | b2985c80057c8bee230d01e056cd862b6310fe30 /sys-libs/timezone-data | |
parent | expose jpeg2k support via openjpeg (bug 518540) (diff) | |
download | gentoo-2-fad1cac32ce3de49c56b713c93932b995c69b436.tar.gz gentoo-2-fad1cac32ce3de49c56b713c93932b995c69b436.tar.bz2 gentoo-2-fad1cac32ce3de49c56b713c93932b995c69b436.zip |
Make upgrade logic more robust #506570 by Cănărău Constantin.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/timezone-data')
-rw-r--r-- | sys-libs/timezone-data/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/timezone-data/timezone-data-2014e.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index 024f063f72a3..c5a7f60f4316 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.305 2014/07/30 06:33:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.306 2014/07/30 06:46:16 vapier Exp $ + + 30 Jul 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014e.ebuild: + Make upgrade logic more robust #506570 by Cănărău Constantin. 30 Jul 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014d.ebuild: Stabilize for all. diff --git a/sys-libs/timezone-data/timezone-data-2014e.ebuild b/sys-libs/timezone-data/timezone-data-2014e.ebuild index d67601fd9c40..d995faeacea1 100644 --- a/sys-libs/timezone-data/timezone-data-2014e.ebuild +++ b/sys-libs/timezone-data/timezone-data-2014e.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.2 2014/07/07 22:05:08 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.3 2014/07/30 06:46:16 vapier Exp $ EAPI="4" @@ -29,7 +29,11 @@ pkg_setup() { # dir here, but newer one installs symlinks. Portage will # barf when you try to transition file types. if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then - if [[ -d posix ]] ; then + # In case of a failed upgrade, clean up the symlinks #506570 + if [ -L .gentoo-upgrade ] ; then + rm -rf posix .gentoo-upgrade + fi + if [ -d posix ] ; then rm -rf .gentoo-upgrade #487192 mv posix .gentoo-upgrade || die ln -s .gentoo-upgrade posix || die |