For kickstart installs, the storage changes have already been committed
to disk by the time we run in to the depsolving exception window. Do
not offer the 'Back' button for kickstart installs since you can't go
back from here. Only way out is to Continue or exit.
---
yuminstall.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/yuminstall.py b/yuminstall.py
index 3e7f90d..8b72d19 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1047,7 +1047,7 @@ class AnacondaYum(YumSorter):
msg = _("There was an error running your transaction for "
"the following reason: %s\n") % str(e)
- if self.anaconda.id.upgrade:
+ if self.anaconda.id.upgrade or anaconda.isKickstart:
rc = intf.messageWindow(_("Error"), msg, type="custom",
custom_icon="error",
custom_buttons=[_("_Exit installer")])
@@ -1564,6 +1564,10 @@ debuglevel=10
# 2 if success
depprob = "\n".join(msgs)
+ custom_buttons = [_("_Exit installer"), _("_Continue")]
+ if not anaconda.isKickstart:
+ custom_buttons.insert(1, _("_Back"))
+
rc = anaconda.intf.detailedMessageWindow(_("Warning"),
_("Some of the packages you have selected for "
"install are missing dependencies. You can "
@@ -1572,13 +1576,12 @@ debuglevel=10
"installing these packages without their "
"dependencies."),
depprob + "\n", type="custom", custom_icon="error",
- custom_buttons=[_("_Exit installer"), _("_Back"),
- _("_Continue")])
+ custom_buttons=custom_buttons)
dscb.pop()
if rc == 0:
sys.exit(1)
- elif rc == 1:
+ elif rc == 1 and len(custom_buttons) == 3:
self.ayum._undoDepInstalls()
return DISPATCH_BACK
--
1.7.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
