Author: glen Date: Sat Jan 12 15:07:21 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- allow %banner work without heredoc
- make %banner behave like one command in scripts
---- Files affected:
SOURCES:
rpm.macros (1.413 -> 1.414)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.413 SOURCES/rpm.macros:1.414
--- SOURCES/rpm.macros:1.413 Sun Jan 6 20:58:00 2008
+++ SOURCES/rpm.macros Sat Jan 12 16:07:15 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,8 @@
else \
CMD="cat%{-e: >&2}" \
fi \
-eval $CMD %2%{?3: %3} \
-%nil
+eval $CMD %{?2:%2}%{?3: %3} \
+\}; %{nil}
# useradd/groupadd macros
# Author: Elan Ruusam�e <[EMAIL PROTECTED]>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.413&r2=1.414&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
