Module Name: src
Committed By: matt
Date: Thu Jun 25 05:27:00 UTC 2015
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Don't add duplicate compat paths
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 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.167 src/distrib/sets/sets.subr:1.168
--- src/distrib/sets/sets.subr:1.167 Tue Jun 23 00:58:16 2015
+++ src/distrib/sets/sets.subr Thu Jun 25 05:27:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.167 2015/06/23 00:58:16 matt Exp $
+# $NetBSD: sets.subr,v 1.168 2015/06/25 05:27:00 matt 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.167 2015/06/23 00:58:16 matt Exp $
+# # $NetBSD: sets.subr,v 1.168 2015/06/25 05:27:00 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -418,7 +418,11 @@ list_set_files()
if (iscompatfile) {
emitcompat[$1] = 1;
- next;
+ next
+ }
+ for (d in cpaths) {
+ if (cpaths[d] == $1 "/")
+ next
}
cpaths[ncpaths++] = $1 "/"
for (d in compatarchdirs) {
