diff options
| -rw-r--r-- | release/sysinstall/dmenu.c | 2 | ||||
| -rw-r--r-- | release/sysinstall/install.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sade/dmenu.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dmenu.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 8 |
6 files changed, 15 insertions, 15 deletions
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index c8094d8..2bdf762 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -52,7 +52,7 @@ int dmenuSubmenu(dialogMenuItem *tmp) { return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RECREATE; + DITEM_RESTORE; } int diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 27d826e..61fe696 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -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; } diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c index c8094d8..2bdf762 100644 --- a/usr.sbin/sade/dmenu.c +++ b/usr.sbin/sade/dmenu.c @@ -52,7 +52,7 @@ int dmenuSubmenu(dialogMenuItem *tmp) { return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RECREATE; + DITEM_RESTORE; } int diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 27d826e..61fe696 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -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; } diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c index c8094d8..2bdf762 100644 --- a/usr.sbin/sysinstall/dmenu.c +++ b/usr.sbin/sysinstall/dmenu.c @@ -52,7 +52,7 @@ int dmenuSubmenu(dialogMenuItem *tmp) { return (dmenuOpenSimple((DMenu *)(tmp->data), FALSE) ? DITEM_SUCCESS : DITEM_FAILURE) | - DITEM_RECREATE; + DITEM_RESTORE; } int diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 27d826e..61fe696 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -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; } |
