[packages/adapter: 244/631] - also sort commented out BR - Applications/Daemons group doesn't exist - replace commas in verify a

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


commit 8409a9b2512e5c5e314e404867e753dfdeea7c4b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Dec 13 13:58:29 2005 +0000

    - also sort commented out BR
    - Applications/Daemons group doesn't exist
    - replace commas in verify attrs with spaces
    
    Changed files:
        adapter.awk -> 1.235

 adapter.awk | 6 ++++++
 1 file changed, 6 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index 9fe3767..bc033c7 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -94,6 +94,8 @@ function b_makekey(a, b,	s) {
 	s = a "" b;
 	# kill bcond
     gsub(/[#%]+{[!?]+[_a-zA-Z0-9]+:/, "", s);
+	# kill commented out items
+    gsub(/[# \t]*/, "", s);
 	return s;
 }
 
@@ -560,6 +562,7 @@ preamble == 1 {
 		sub(/^System Environment\/Libraries$/, "Libraries", Grupa)
 		sub(/^System Environment\/Daemons$/, "Daemons", Grupa)
 		sub(/^Applications\/Internet$/, "Applications/Networking", Grupa)
+		sub(/^Applications\/Daemons$/, "Daemons", Grupa)
 		sub(/^System\/Servers$/, "Daemons", Grupa)
 		sub(/^X11\/Xserver$/, "X11/Servers", Grupa)
 		sub(/^X11\/XFree86$/, "X11", Grupa)
@@ -1068,6 +1071,9 @@ function use_files_macros(	i, n, t, a)
 	# sort %verify attrs
 	if (match($0, /%verify\(not([^)]+)\)/)) {
 		t = substr($0, RSTART, RLENGTH)
+		# kill commas: %verify(not,md5,size,mtime)
+		gsub(/,/, " ", t);
+
 		gsub(/^%verify\(not |\)$/, "", t)
 		n = split(t, a, / /)
 		isort(a, n)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list