Исправлен вывод устанавливаемых пакетов

master3.3 3.2.0_alpha3
Mike khiretskiy hace 10 años
padre 5c8b5438fc
commit a2057fab4a

@ -321,7 +321,7 @@ class Update:
_("List packages for installation")))
self._display_pretty_package_list(pkglist)
# TODO: список удаляемых пакетов во время установки
if str(emerge.download_size):
if str(emerge.download_size) != "0 kB":
self.printSUCCESS(_print.bold(
_("{size} will be downloaded").format(
size=emerge.download_size)))
@ -449,14 +449,14 @@ class Update:
if not emerge.install_packages.list:
#self.printSUCCESS(_("Nothing to merge"))
return True
if ask_emerge:
self.printPre(str(emerge.install_packages))
#if ask_emerge:
# self.printPre(str(emerge.install_packages))
except EmergeError:
self.printPre(self._emerge_translate(emerge.prepare_error))
raise
if (ask_emerge and self.askConfirm(
_("Would you like to merge these packages?")) == 'no'):
raise KeyboardInterrupt
#if (ask_emerge and self.askConfirm(
# _("Would you like to merge these packages?")) == 'no'):
# raise KeyboardInterrupt
emerge.command.send("yes\n")
emerge.emerging.add_observer(self._printEmergePackage)

Cargando…
Cancelar
Guardar