summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-08-08 07:23:09 +0000
committerMike Frysinger <vapier@gentoo.org>2014-08-08 07:23:09 +0000
commita45f567ccb65ec4e00c9a7dfafd7fccdc9ddf946 (patch)
tree83d8dfc8248677db4d6f816b0352efb6b00ca023 /sys-libs
parentVersion bump. (diff)
downloadgentoo-2-a45f567ccb65ec4e00c9a7dfafd7fccdc9ddf946.tar.gz
gentoo-2-a45f567ccb65ec4e00c9a7dfafd7fccdc9ddf946.tar.bz2
gentoo-2-a45f567ccb65ec4e00c9a7dfafd7fccdc9ddf946.zip
Fix get_TIMEZONE output #519256 by Daniel Kenzelmann.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/timezone-data/ChangeLog6
-rw-r--r--sys-libs/timezone-data/timezone-data-2014e.ebuild4
-rw-r--r--sys-libs/timezone-data/timezone-data-2014f.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index a6672cd30575..84cf2f36ec18 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.307 2014/08/07 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.308 2014/08/08 07:23:09 vapier Exp $
+
+ 08 Aug 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014e.ebuild,
+ timezone-data-2014f.ebuild:
+ Fix get_TIMEZONE output #519256 by Daniel Kenzelmann.
*timezone-data-2014f (07 Aug 2014)
diff --git a/sys-libs/timezone-data/timezone-data-2014e.ebuild b/sys-libs/timezone-data/timezone-data-2014e.ebuild
index d995faeacea1..876f952fe832 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.3 2014/07/30 06:46:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.4 2014/08/08 07:23:09 vapier Exp $
EAPI="4"
@@ -101,7 +101,7 @@ get_TIMEZONE() {
else
tz="FOOKABLOIE"
fi
- [[ -z ${tz} ]]
+ [[ -z ${tz} ]] && return 1 || echo "${tz}"
}
pkg_preinst() {
diff --git a/sys-libs/timezone-data/timezone-data-2014f.ebuild b/sys-libs/timezone-data/timezone-data-2014f.ebuild
index 10ebcc314a13..00843c14ff23 100644
--- a/sys-libs/timezone-data/timezone-data-2014f.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2014f.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-2014f.ebuild,v 1.1 2014/08/07 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014f.ebuild,v 1.2 2014/08/08 07:23:09 vapier Exp $
EAPI="4"
@@ -101,7 +101,7 @@ get_TIMEZONE() {
else
tz="FOOKABLOIE"
fi
- [[ -z ${tz} ]]
+ [[ -z ${tz} ]] && return 1 || echo "${tz}"
}
pkg_preinst() {