Module Name: src
Committed By: martin
Date: Thu Apr 12 14:48:39 UTC 2018
Modified Files:
src/distrib/sets [netbsd-8]: sets.subr
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #747):
distrib/sets/sets.subr: revision 1.184
Handle compatdir first whether making obsolete lists or not, to
make obsolete lists including compat directory (eg. ./usr/lib/i386)
properly.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.179.4.1 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.179 src/distrib/sets/sets.subr:1.179.4.1
--- src/distrib/sets/sets.subr:1.179 Wed Feb 8 18:21:23 2017
+++ src/distrib/sets/sets.subr Thu Apr 12 14:48:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
+# $NetBSD: sets.subr,v 1.179.4.1 2018/04/12 14:48:39 martin Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
+# # $NetBSD: sets.subr,v 1.179.4.1 2018/04/12 14:48:39 martin Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -364,6 +364,13 @@ list_set_files()
if (kw == "obsolete")
haveobs = 1
}
+ if (iscompatdir) {
+ for (d in cpaths) {
+ if (cpaths[d] == $1 "/")
+ next
+ }
+ cpaths[ncpaths++] = $1 "/"
+ }
if (obsolete && ! haveobs)
next
if (!show)
@@ -387,11 +394,6 @@ list_set_files()
emitcompat[$1] = 1;
next
}
- for (d in cpaths) {
- if (cpaths[d] == $1 "/")
- next
- }
- cpaths[ncpaths++] = $1 "/"
for (d in compatarchdirs) {
tmp = $0
xfile = $1 "/" compatarchdirs[d]
