SOURCES (AC-branch): rpm.macros, rpm.macros - make %banner use eva...

glen glen at pld-linux.org
Thu Sep 15 19:20:08 CEST 2005


Author: glen                         Date: Thu Sep 15 17:20:08 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- make %banner use eval on $CMD so CMD="cat >&2" could work when banner.sh is not installed

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.60 -> 1.158.4.61) 
SOURCES:
   rpm.macros (1.238 -> 1.239) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.60 SOURCES/rpm.macros:1.158.4.61
--- SOURCES/rpm.macros:1.158.4.60	Tue Sep 13 22:34:25 2005
+++ SOURCES/rpm.macros	Thu Sep 15 19:20:02 2005
@@ -610,7 +610,7 @@
 else \
 	CMD="cat%{-e: >&2}" \
 fi \
-$CMD %2%{?3: %3} \
+eval $CMD %2%{?3: %3} \
 %nil
 
 # useradd/groupadd macros written by glen at pld-linux.org.

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.238 SOURCES/rpm.macros:1.239
--- SOURCES/rpm.macros:1.238	Tue Sep 13 22:40:13 2005
+++ SOURCES/rpm.macros	Thu Sep 15 19:20:03 2005
@@ -611,7 +611,7 @@
 else \
 	CMD="cat%{-e: >&2}" \
 fi \
-$CMD %2%{?3: %3} \
+eval $CMD %2%{?3: %3} \
 %nil
 
 # useradd/groupadd macros written by glen at pld-linux.org.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.60&r2=1.158.4.61&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.238&r2=1.239&f=u




More information about the pld-cvs-commit mailing list