From 236f78176b771f635e1656fcd48c25accac27c7e Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 20 Oct 2014 13:48:10 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B2=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=B2=D1=8B=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D0=B8=D0=BC=D1=81=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/update.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 3db40c6..b462210 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -617,13 +617,13 @@ class Update: mult=mult, fullname=fullname, shortname=shortname, size=size, flag=install_flag)) - def _display_install_package(self, emerge): + def _display_install_package(self, emerge, emergelike=False): """ Отобразить список устанавливаемых пакетов """ # подробный список пакетов _print = self.color_print - if self.clVars.Get('cl_update_emergelist_set') == 'on': + if emergelike: self.printPre(str(emerge.install_packages)) else: pkglist = emerge.install_packages.list @@ -722,10 +722,12 @@ class Update: self.printSUCCESS(_("The system is up to date")) self.set_need_update(False) return True - self._display_install_package(emerge) + emergelike = self.clVars.Get('cl_update_emergelist_set') == 'on' + self._display_install_package(emerge, emergelike) except EmergeError: self.set_need_update(False) self.emerge_cache.drop_cache("Emerge error") + self._display_install_package(emerge, emergelike=True) self._display_error(emerge.prepare_error) raise if self.clVars.Get('cl_update_pretend_set') == 'on':