[src/trunk]: src/distrib/sets Add a method to a whiteout an entry thereby all...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28f209fa2190
branches:  trunk
changeset: 761471:28f209fa2190
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jan 28 20:36:19 2011 +0000

description:
Add a method to a whiteout an entry thereby allowing a md/ad file to remove
a file from the set lists.

Use this for md.evbppc which doesn't build some module tests.

diffstat:

 distrib/sets/lists/tests/md.evbppc |   6 ++++++
 distrib/sets/sets.subr             |  25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 92226b4f0277 -r 28f209fa2190 distrib/sets/lists/tests/md.evbppc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/tests/md.evbppc        Fri Jan 28 20:36:19 2011 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: md.evbppc,v 1.1 2011/01/28 20:36:20 matt Exp $
+#
+# Note: don't delete entries from here - mark them as "obsolete" instead.
+#
+-./usr/libdata/debug/usr/tests/modules/t_builtin.debug
+-./usr/libdata/debug/usr/tests/modules/t_modctl.debug
diff -r 92226b4f0277 -r 28f209fa2190 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Fri Jan 28 20:36:06 2011 +0000
+++ b/distrib/sets/sets.subr    Fri Jan 28 20:36:19 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
+#      $NetBSD: sets.subr,v 1.127 2011/01/28 20:36:19 matt Exp $
 #
 
 #
@@ -172,7 +172,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
+#      # $NetBSD: sets.subr,v 1.127 2011/01/28 20:36:19 matt Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -299,7 +299,16 @@
                        next;
                }
 
+               /^-/ {
+                       notwanted[substr($1, 2)] = 1;
+                       delete list [substr($1, 2)];
+                       next;
+               }
+                               
+
                NF > 2 && $3 != "-" {
+                       if (notwanted[$1] != "")
+                               next;
                        split($3, keywords, ",")
                        show = 1
                        haveobs = 0
@@ -323,13 +332,21 @@
                        if (obsolete && ! haveobs)
                                next
                        if (show)
-                               print
+                               list[$1] = $0
                        next
                }
 
                {
+                       if (notwanted[$1] != "")
+                               next;
                        if (! obsolete)
-                               print
+                               list[$1] = $0
+               }
+
+               END {
+                       for (i in list) {
+                               print list[i]
+                       }
                }'
 
 }