From a2057fab4ac9ee293bc84046d1510c39b0c90010 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Wed, 9 Apr 2014 16:45:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=83=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B0=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/update.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/update/update.py b/update/update.py index 059c3a1..fbb6782 100644 --- a/update/update.py +++ b/update/update.py @@ -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)