Merge branch 'master' of ssh://sabayon.org/~git/projects/entropy

client/text_ui.py

@@ -83,7 +83,7 @@ def package(options):
             except ValueError:
                 continue
             if myn not in list(range(2, 11)):
-                continue
+                myn = 10
             equoRequestMultifetch = myn
         elif (opt == "--nochecksum"):
             equoRequestChecksum = False
@@ -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)
 

misc/po/POTFILES.in

@@ -74,7 +74,6 @@
 ../libraries/entropy/tools.py
 ../libraries/entropy/transceivers.py
 ../libraries/entropy/xpak.py
-../libraries/test.py
 ../client/equo.py
 ../client/text_cache.py
 ../client/text_configuration.py