Author: arekm Date: Sat Mar 28 13:03:41 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix env cleaning
---- Files affected:
SOURCES:
rpm.macros (1.515 -> 1.516)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.515 SOURCES/rpm.macros:1.516
--- SOURCES/rpm.macros:1.515 Thu Mar 26 12:48:29 2009
+++ SOURCES/rpm.macros Sat Mar 28 14:03:36 2009
@@ -141,9 +141,8 @@
%_preserve_env_base PATH HOME TMP TMPDIR SSH_AUTH_SOCK
-%_clean_env \
- %{!?_preserve_env:%global _preserve_env %{nil}}%{expand:%%global
_preserve_env %{_preserve_env} %_preserve_env_base} \
- env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
+# "env -i" must end in first line of expaned macros because it's used as first
line of shell script (#! env...)
+%_clean_env %{!?_preserve_env:%global _preserve_env
%{nil}}%{expand:%%global _preserve_env %{_preserve_env} %_preserve_env_base}
env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
split("%{?_preserve_env}", P);
for (i in P) {
p = P[i];
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.515&r2=1.516&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
