diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-04-11 15:26:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-04-11 15:26:42 +0000 |
| commit | 959f45367cd2a09cafabcc9b49f3fd89b3985d78 (patch) | |
| tree | 7047174cb7a7c707c24041d72c867f2d14c7450b /sys-libs | |
| parent | Add ~alpha/~ia64 (diff) | |
| download | gentoo-2-959f45367cd2a09cafabcc9b49f3fd89b3985d78.tar.gz gentoo-2-959f45367cd2a09cafabcc9b49f3fd89b3985d78.tar.bz2 gentoo-2-959f45367cd2a09cafabcc9b49f3fd89b3985d78.zip | |
Strip comments and spaces from /etc/timezone as suggested by Alon Bar-Lev #265736.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/timezone-data/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2009e.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index ba6216f2f229..5081492def5e 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.178 2009/04/10 13:40:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.179 2009/04/11 15:26:42 vapier Exp $ + + 11 Apr 2009; Mike Frysinger <vapier@gentoo.org> + timezone-data-2009e.ebuild: + Strip comments and spaces from /etc/timezone as suggested by Alon Bar-Lev + #265736. 10 Apr 2009; Raúl Porcel <armin76@gentoo.org> timezone-data-2009c.ebuild: alpha/arm/ia64/m68k/s390/sh/x86 stable wrt #265522 diff --git a/sys-libs/timezone-data/timezone-data-2009e.ebuild b/sys-libs/timezone-data/timezone-data-2009e.ebuild index 8921106c878d..190c76833497 100644 --- a/sys-libs/timezone-data/timezone-data-2009e.ebuild +++ b/sys-libs/timezone-data/timezone-data-2009e.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2009e.ebuild,v 1.1 2009/04/09 09:42:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2009e.ebuild,v 1.2 2009/04/11 15:26:42 vapier Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -72,7 +72,7 @@ pkg_config() { else src="/etc/timezone" if [[ -e ${ROOT}/etc/timezone ]] ; then - tz=$(<"${ROOT}"/etc/timezone) + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${ROOT}"/etc/timezone) else tz="FOOKABLOIE" fi |