commit 7c0a3893c8f8f1eb9436b5449f87ee9c642f8720
Author: Marcin Krol <[email protected]>
Date: Fri Aug 2 19:53:26 2013 +0000
- kill _preserve_env recursion (every call to _clean_env was causing
_preserve_end self duplication and in result mawk SEGV at some point)
rpm-build-macros.spec | 2 +-
rpm.macros | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index fd7f13f..244b129 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -11,7 +11,7 @@ Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 3
+Release: 4
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index e33b773..1191109 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -186,8 +186,8 @@
%_preserve_env_base PATH HOME TMP TMPDIR SSH_AUTH_SOCK
# "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);
+%_clean_env env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
+ split("%{?_preserve_env:%_preserve_env
%_preserve_env_base}%{!?_preserve_env:%_preserve_env_base}", P);
for (i in P) {
p = P[i];
if (!ENVIRON[p] || d[p]) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/7c0a3893c8f8f1eb9436b5449f87ee9c642f8720
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
