Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 15:35:08 UTC 2014
Modified Files:
src/usr.bin/config: main.c
Log Message:
Revert a mistakenly added, superflous attribute match test that caused some
valid options to get lost.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/config/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.62 src/usr.bin/config/main.c:1.63
--- src/usr.bin/config/main.c:1.62 Fri Oct 10 10:46:05 2014
+++ src/usr.bin/config/main.c Fri Oct 10 15:35:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.62 2014/10/10 10:46:05 uebayasi Exp $ */
+/* $NetBSD: main.c,v 1.63 2014/10/10 15:35:08 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -559,17 +559,11 @@ do_depend(struct nvlist *nv)
* it to the selecttab.
*/
CFGDBG(3, "depend attr `%s'", nv->nv_name);
- /* XXX Do uppercased attribute names exist? */
if ((a = ht_lookup(attrtab, nv->nv_name)) != NULL) {
if (a->a_iattr)
panic("do_depend(%s): dep `%s' is an iattr",
nv->nv_name, a->a_name);
expandattr(a, selectattr);
- } else if ((a = ht_lookup(attrtab, n)) != NULL) {
- if (a->a_iattr)
- panic("do_depend(%s): dep `%s' is an iattr",
- n, a->a_name);
- expandattr(a, selectattr);
} else {
if (ht_lookup(opttab, nv->nv_name) == NULL)
addoption(nv->nv_name, NULL);
