diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2014-01-11 23:28:03 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2014-01-11 23:28:03 +0000 |
| commit | dfefc0556453bf2b94a779b6d93f74e7780db096 (patch) | |
| tree | c31d9b2c85e68269b085dcaa1446106be01f8b36 /distrib/miniroot/install.sub | |
| parent | eeb5422d490b2e386ab777bf1015f5f03fe744c6 (diff) | |
when selecting sets to install, postpone the xbase/comp check so the
comp set does not get readded if the xbase set is being removed later
on the same input line
"nice semantics" deraadt@
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index df169cf0a49..bad0fbf229d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.726 2014/01/08 21:53:35 deraadt Exp $ +# $OpenBSD: install.sub,v 1.727 2014/01/11 23:28:02 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -618,13 +618,12 @@ __EOT for _f in $_avail; do [[ $_f = $resp ]] && _selected=$($_action $_f $_selected) done - if isin $_xbase $_selected && isin $_comp $_avail ; then - if ! isin $_comp $_selected ; then - _selected=$(addel $_comp $_selected) - echo "The xbase set requires the comp set, so adding it back in." - fi - fi done + if isin $_xbase $_selected && ! isin $_comp $_selected && + isin $_comp $_avail; then + _selected=$(addel $_comp $_selected) + echo "The xbase set requires the comp set, so adding it back in." + fi done set +o noglob |