vapier 14/07/30 06:46:17 Modified: timezone-data-2014e.ebuild ChangeLog Log: 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)
Revision Changes Path 1.3 sys-libs/timezone-data/timezone-data-2014e.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?r1=1.2&r2=1.3 Index: timezone-data-2014e.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- timezone-data-2014e.ebuild 7 Jul 2014 22:05:08 -0000 1.2 +++ timezone-data-2014e.ebuild 30 Jul 2014 06:46:16 -0000 1.3 @@ -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 @@ # 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 1.306 sys-libs/timezone-data/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.305&r2=1.306 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- ChangeLog 30 Jul 2014 06:33:25 -0000 1.305 +++ ChangeLog 30 Jul 2014 06:46:16 -0000 1.306 @@ -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 <[email protected]> timezone-data-2014e.ebuild: + Make upgrade logic more robust #506570 by Cănărău Constantin. 30 Jul 2014; Mike Frysinger <[email protected]> timezone-data-2014d.ebuild: Stabilize for all.
