SOURCES: rpm.macros - move whole %banner expansion to subshell, he...

[glen]

Author: glen                         Date: Tue Jan 15 21:25:45 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- move whole %banner expansion to subshell, heredoc redirection works now too

---- Files affected:
SOURCES:
   rpm.macros (1.414 -> 1.415) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.414 SOURCES/rpm.macros:1.415
--- SOURCES/rpm.macros:1.414	Sat Jan 12 16:07:15 2008
+++ SOURCES/rpm.macros	Tue Jan 15 22:25:40 2008
@@ -811,7 +811,7 @@
 # -e   - send to stderr instead of stdout
 # -n   - no show banner (overrides -t)
 # -t   - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5
-%banner(aent:) \{ \
+%banner(aent:) ( \
 RPM_SCRIPTVERBOSITY=5 \
 [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 if [ -x /usr/bin/banner.sh ]; then \
@@ -819,8 +819,7 @@
 else \
 	CMD="cat%{-e: >&2}" \
 fi \
-eval $CMD %{?2:%2}%{?3: %3} \
-\}; %{nil}
+eval $CMD %{?2:%2}%{?3: %3})%{nil}
 
 # useradd/groupadd macros
 # Author: Elan Ruusamäe <glen at pld-linux.org>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.414&r2=1.415&f=u