From 2b4c11bc6de9763343099e1f9549555fd1078bd0 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 10 Oct 2009 23:32:15 +0200 Subject: [PATCH] [equo] when using --nodeps and --ask, do not invalidate the latter --- client/text_ui.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/client/text_ui.py b/client/text_ui.py index 6db22fbce..e84584c27 100644 --- a/client/text_ui.py +++ b/client/text_ui.py @@ -583,11 +583,13 @@ def _showPackageInfo(foundAtoms, deps): if (etpUi['verbose'] or etpUi['ask'] or etpUi['pretend']): print_info(red(" @@ ")+blue("%s: " % (_("Packages involved"),) )+str(totalatoms)) - if deps: - if (etpUi['ask']): + if etpUi['ask']: + if deps: rc = Equo.askQuestion(" %s" % (_("Would you like to continue with dependencies calculation ?"),) ) - if rc == _("No"): - return True, (0, 0) + else: + rc = Equo.askQuestion(" %s" % (_("Would you like to continue with the installation ?"),) ) + if rc == _("No"): + return True, (0, 0) return False, (0, 0)