summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-01-17 21:34:52 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-01-17 21:34:52 +0000
commit87a76b7f8da09614d1cee08a36e511169dd69b10 (patch)
treeae9160c054fd4e0191d961f60ff17d72f8a57ed4 /eclass/linux-info.eclass
parentReplace jpeg-compat with slotted <jpeg-7. (diff)
downloadhistorical-87a76b7f8da09614d1cee08a36e511169dd69b10.tar.gz
historical-87a76b7f8da09614d1cee08a36e511169dd69b10.tar.bz2
historical-87a76b7f8da09614d1cee08a36e511169dd69b10.zip
Merge first part of patch from bug #87242: New warning output method and support for another assignment type in makefile non-exec parsing.
Diffstat (limited to 'eclass/linux-info.eclass')
-rw-r--r--eclass/linux-info.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 23690760c247..76c0886ea4f9 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.81 2010/01/10 09:26:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.82 2010/01/17 21:34:52 robbat2 Exp $
#
# Original author: John Mylchreest <johnm@gentoo.org>
# Maintainer: kernel-misc@gentoo.org
@@ -148,6 +148,7 @@ qout() {
}
qeinfo() { qout einfo "${@}" ; }
+qewarn() { qout ewarn "${@}" ; }
qeerror() { qout eerror "${@}" ; }
# File Functions
@@ -208,7 +209,7 @@ getfilevar_noexec() {
else
${mycat} "${2}" | \
sed -n \
- -e "/^[[:space:]]*${1}[[:space:]]*=[[:space:]]*\(.*\)\$/{
+ -e "/^[[:space:]]*${1}[[:space:]]*:\\?=[[:space:]]*\(.*\)\$/{
s,^[^=]*[[:space:]]*=[[:space:]]*,,g ;
s,[[:space:]]*\$,,g ;
p