Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets Don't add duplicate compat paths



details:   https://anonhg.NetBSD.org/src/rev/b64991b8521f
branches:  trunk
changeset: 339070:b64991b8521f
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jun 25 05:27:00 2015 +0000

description:
Don't add duplicate compat paths

diffstat:

 distrib/sets/sets.subr |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 0c64813c5b88 -r b64991b8521f distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Thu Jun 25 01:38:09 2015 +0000
+++ b/distrib/sets/sets.subr    Thu Jun 25 05:27:00 2015 +0000
@@ -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 @@
 # 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 @@
 
                        if (iscompatfile) {
                                emitcompat[$1] = 1;
-                               next;
+                               next
+                       }
+                       for (d in cpaths) {
+                               if (cpaths[d] == $1 "/")
+                                       next
                        }
                        cpaths[ncpaths++] = $1 "/"
                        for (d in compatarchdirs) {



Home | Main Index | Thread Index | Old Index