diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-06-08 07:15:55 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-06-08 07:15:55 +0000 |
commit | 58fa43d11fa5260936fd7f54da0a7d22f33530bb (patch) | |
tree | 31f9f8b5d434abfdd2876eb3e61b16cef2c7a3c0 /release | |
parent | 7b0a4c23a42e0cd8dfe1106fc3f63b14984624f4 (diff) | |
download | src-58fa43d11fa5260936fd7f54da0a7d22f33530bb.tar.gz src-58fa43d11fa5260936fd7f54da0a7d22f33530bb.zip |
Merge changes from HEAD.
Notes
Notes:
svn path=/head/; revision=16203
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/index.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index d08f98b0cd38..ad537fc2e366 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.30 1996/05/23 16:34:27 jkh Exp $ + * $Id: index.c,v 1.31 1996/06/08 07:02:19 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -384,15 +384,8 @@ pkg_checked(dialogMenuItem *self) { PkgNodePtr kp = self->data, plist = (PkgNodePtr)self->aux; - if (kp->type == PACKAGE && kp->name && plist) { - int i; - - i = index_search(plist, kp->name, NULL) ? TRUE : FALSE; - if (!RunningAsInit) - return i || package_exists(kp->name); - else - return i; - } + if (kp->type == PACKAGE && plist) + return index_search(plist, kp->name, NULL) ? TRUE : FALSE; else return FALSE; } @@ -409,16 +402,14 @@ pkg_fire(dialogMenuItem *self) sp = index_search(plist, kp->name, NULL); /* Not already selected? */ if (!sp) { - if (RunningAsInit || !package_exists(kp->name)) { - PkgNodePtr np = (PkgNodePtr)safe_malloc(sizeof(PkgNode)); + PkgNodePtr np = (PkgNodePtr)safe_malloc(sizeof(PkgNode)); - *np = *kp; - np->next = plist->kids; - plist->kids = np; - msgInfo("Added %s to selection list", kp->name); - } + *np = *kp; + np->next = plist->kids; + plist->kids = np; + msgInfo("Added %s to selection list", kp->name); } - else { + else if (sp) { msgInfo("Removed %s from selection list", kp->name); index_delete(sp); } |