diff options
author | Mike Gilbert <floppym@gentoo.org> | 2013-03-17 17:53:48 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-17 17:53:48 +0000 |
commit | 926a58f658ccb89564108544df17c83e9104163c (patch) | |
tree | 1ef178a5ae818014b0b9bc73d49431baaf5710ec /www-client | |
parent | Add proxy-maintainers to metadata.xml (diff) | |
download | gentoo-2-926a58f658ccb89564108544df17c83e9104163c.tar.gz gentoo-2-926a58f658ccb89564108544df17c83e9104163c.tar.bz2 gentoo-2-926a58f658ccb89564108544df17c83e9104163c.zip |
Don't set nullglob since that makes it difficult to pass wildcards in CHROMIUM_FLAGS. Bug 461864.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-launcher-r3.sh | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 1d5530fa17b6..a857d201f289 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.846 2013/03/14 02:53:10 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.847 2013/03/17 17:53:48 floppym Exp $ + + 17 Mar 2013; Mike Gilbert <floppym@gentoo.org> files/chromium-launcher-r3.sh: + Don't set nullglob since that makes it difficult to pass wildcards in + CHROMIUM_FLAGS. Bug 461864. *chromium-26.0.1410.33 (14 Mar 2013) diff --git a/www-client/chromium/files/chromium-launcher-r3.sh b/www-client/chromium/files/chromium-launcher-r3.sh index 6013ee5a79f4..f2bbedd22698 100644 --- a/www-client/chromium/files/chromium-launcher-r3.sh +++ b/www-client/chromium/files/chromium-launcher-r3.sh @@ -3,7 +3,6 @@ # Allow the user to override command-line flags, bug #357629. # This is based on Debian's chromium-browser package, and is intended # to be consistent with Debian. -shopt -s nullglob for f in /etc/chromium/*; do [[ -f ${f} ]] && source "${f}" done |