d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a real brain-o in my check for when a "fixup" should be run.

Browse Source 
Don't recreate parent menus just for submenus - it's irritating.
This commit is contained in:
jkh 1997-01-19 10:27:12 +00:00
parent 1d0095968b
commit 64f19380c2
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/dmenu.c
View File

@ -52,7 +52,7 @@ int
dmenuSubmenu(dialogMenuItem *tmp)
{
return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) |
DITEM_RECREATE;
DITEM_RESTORE;
}
int

8
release/sysinstall/install.c
View File

@ -716,10 +716,10 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS && (!need_bin || !(Dists & DIST_BIN)))
i = installFixup(self);
else
i = DITEM_FAILURE;
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE;
}

2
usr.sbin/sade/dmenu.c
View File

@ -52,7 +52,7 @@ int
dmenuSubmenu(dialogMenuItem *tmp)
{
return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) |
DITEM_RECREATE;
DITEM_RESTORE;
}
int

8
usr.sbin/sade/install.c
View File

@ -716,10 +716,10 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS && (!need_bin || !(Dists & DIST_BIN)))
i = installFixup(self);
else
i = DITEM_FAILURE;
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE;
}

2
usr.sbin/sysinstall/dmenu.c
View File

@ -52,7 +52,7 @@ int
dmenuSubmenu(dialogMenuItem *tmp)
{
return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) |
DITEM_RECREATE;
DITEM_RESTORE;
}
int

8
usr.sbin/sysinstall/install.c
View File

@ -716,10 +716,10 @@ installCommit(dialogMenuItem *self)
need_bin = Dists & DIST_BIN;
i = distExtractAll(self);
if (DITEM_STATUS(i) == DITEM_SUCCESS && (!need_bin || !(Dists & DIST_BIN)))
i = installFixup(self);
else
i = DITEM_FAILURE;
if (DITEM_STATUS(i) == DITEM_SUCCESS) {
if (need_bin && !(Dists & DIST_BIN))
i = installFixup(self);
}
variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
return i | DITEM_RESTORE;
}