[packages/adapter: 289/631] - leave sed -i -e lines alone

glen glen at pld-linux.org
Mon Sep 12 19:58:40 CEST 2016


commit b05d5275c86cfe2b72173531e414fcb8fd4058b1
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Feb 17 16:16:52 2006 +0000

    - leave sed -i -e lines alone
    
    Changed files:
        adapter.awk -> 1.279

 adapter.awk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index 580b423..fa9ea48 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -888,6 +888,11 @@ function use_macros()
 		return
 	}
 
+	# leave inline sed lines alone
+	if (/(%{__sed}|sed) -i -e/) {
+		return;
+	}
+
 	gsub(perl_sitearch, "%{perl_sitearch}")
 	gsub(perl_archlib, "%{perl_archlib}")
 	gsub(perl_privlib, "%{perl_privlib}")
@@ -900,7 +905,7 @@ function use_macros()
 
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
-	if(prefix"/bin" == bindir)
+	if (prefix"/bin" == bindir)
 		gsub("%{_prefix}/bin", "%{_bindir}")
 
 	for (c = 1; c <= NF; c++) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885



More information about the pld-cvs-commit mailing list