[equo] when using --nodeps and --ask, do not invalidate the latter

2009-10-10 23:32:15 +02:00
parent 11f798c23c
commit 2b4c11bc6d
1 changed files with 6 additions and 4 deletions
@@ -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)