| 1 |
vapier 14/07/30 06:46:17 |
| 2 |
|
| 3 |
Modified: timezone-data-2014e.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Make upgrade logic more robust #506570 by Cănărău Constantin. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-libs/timezone-data/timezone-data-2014e.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: timezone-data-2014e.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- timezone-data-2014e.ebuild 7 Jul 2014 22:05:08 -0000 1.2 |
| 23 |
+++ timezone-data-2014e.ebuild 30 Jul 2014 06:46:16 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.2 2014/07/07 22:05:08 ottxor Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.3 2014/07/30 06:46:16 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -29,7 +29,11 @@ |
| 33 |
# dir here, but newer one installs symlinks. Portage will |
| 34 |
# barf when you try to transition file types. |
| 35 |
if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then |
| 36 |
- if [[ -d posix ]] ; then |
| 37 |
+ # In case of a failed upgrade, clean up the symlinks #506570 |
| 38 |
+ if [ -L .gentoo-upgrade ] ; then |
| 39 |
+ rm -rf posix .gentoo-upgrade |
| 40 |
+ fi |
| 41 |
+ if [ -d posix ] ; then |
| 42 |
rm -rf .gentoo-upgrade #487192 |
| 43 |
mv posix .gentoo-upgrade || die |
| 44 |
ln -s .gentoo-upgrade posix || die |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.306 sys-libs/timezone-data/ChangeLog |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.305&r2=1.306 |
| 53 |
|
| 54 |
Index: ChangeLog |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v |
| 57 |
retrieving revision 1.305 |
| 58 |
retrieving revision 1.306 |
| 59 |
diff -u -r1.305 -r1.306 |
| 60 |
--- ChangeLog 30 Jul 2014 06:33:25 -0000 1.305 |
| 61 |
+++ ChangeLog 30 Jul 2014 06:46:16 -0000 1.306 |
| 62 |
@@ -1,6 +1,9 @@ |
| 63 |
# ChangeLog for sys-libs/timezone-data |
| 64 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.305 2014/07/30 06:33:25 vapier Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.306 2014/07/30 06:46:16 vapier Exp $ |
| 67 |
+ |
| 68 |
+ 30 Jul 2014; Mike Frysinger <vapier@g.o> timezone-data-2014e.ebuild: |
| 69 |
+ Make upgrade logic more robust #506570 by Cănărău Constantin. |
| 70 |
|
| 71 |
30 Jul 2014; Mike Frysinger <vapier@g.o> timezone-data-2014d.ebuild: |
| 72 |
Stabilize for all. |
Archives