Author: glen Date: Wed Jan 16 20:53:42 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- still fixing %banner
---- Files affected:
SOURCES:
rpm.macros (1.415 -> 1.416)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.415 SOURCES/rpm.macros:1.416
--- SOURCES/rpm.macros:1.415 Tue Jan 15 22:25:40 2008
+++ SOURCES/rpm.macros Wed Jan 16 21:53:37 2008
@@ -811,6 +811,11 @@
# -e - send to stderr instead of stdout
# -n - no show banner (overrides -t)
# -t - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5
+#
+# Tests:
+# (rpm -E '%banner -e banner <<EOF'; echo -e 'hi\nEOF') > m; sh -x m
+# rpm -E 'date | %banner -e banner' > m; sh -x m
+#
%banner(aent:) ( \
RPM_SCRIPTVERBOSITY=5 \
[ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
@@ -819,7 +824,8 @@
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 <[EMAIL PROTECTED]>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.415&r2=1.416&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
