diff --git a/update/update.py b/update/update.py index f9b1628..8e082fa 100644 --- a/update/update.py +++ b/update/update.py @@ -97,10 +97,6 @@ class Update: needMeta = True if needMeta: dv.Set('cl_update_outdate_set', 'on', force=True) - layman = Layman(dv.Get('cl_update_layman_installed'), - dv.Get('cl_update_layman_make')) - if name != "portage": - layman.add(name, url, rpath) return True def syncRepositories(self, repname, clean_on_error=True): @@ -140,6 +136,11 @@ class Update: else: if not self._syncRepository(repname, url, rpath, revision, branch): return "skip" + + layman = Layman(dv.Get('cl_update_layman_installed'), + dv.Get('cl_update_layman_make')) + if repname != "portage": + layman.add(repname, url, rpath) return True def syncLaymanRepository(self, repname): @@ -359,13 +360,12 @@ class Update: """ # подробный список пакетов _print = self.color_print - highlight = TextState.Colors.WHITE if self.clVars.Get('cl_verbose_set') == 'on': self.printPre(str(emerge.install_packages)) else: pkglist = emerge.install_packages.list self.printSUCCESS(_print( - _("List packages for installation"))) + _("Listing packages for installation"))) self._display_pretty_package_list(pkglist) if emerge.install_packages.remove_list: self.printSUCCESS(_print( @@ -374,8 +374,7 @@ class Update: emerge.install_packages.remove_list, remove_list=True) if str(emerge.download_size) != "0 kB": self.printSUCCESS(_("{size} will be downloaded").format( - size=_print.foreground(highlight)( - str(emerge.download_size)))) + size=str(emerge.download_size))) def _display_remove_list(self, emerge): """ diff --git a/update/utils/cl_update.py b/update/utils/cl_update.py index 82d9247..533d1c1 100644 --- a/update/utils/cl_update.py +++ b/update/utils/cl_update.py @@ -102,7 +102,8 @@ class ClUpdateAction(Action): 'condition': need_upgrade('dev-lang/python$') }, {'name': 'update:python_updater', - 'message': __('Updating Python modules'), + 'message': __('Find & rebuild packages broken due ' + 'to a Python upgrade'), 'method': 'Update.emergelike("python-updater")', 'condition': was_installed('dev-lang/python$', log_names['python_updater']), @@ -112,7 +113,7 @@ class ClUpdateAction(Action): ] }, {'name': 'update:update_perl', - 'group': __("Updating perl"), + 'group': __("Updating Perl"), 'tasks': [ {'name': 'update:update_perl_pkg', 'message': __('Updating {0}').format(pkg_color('dev-lang/perl')), @@ -120,7 +121,8 @@ class ClUpdateAction(Action): 'condition': need_upgrade('dev-lang/perl$') }, {'name': 'update:perl_cleaner', - 'message': __('Updating Perl modules'), + 'message': __('Find & rebuild packages and Perl header files ' + 'broken due to a perl upgrade'), 'method': 'Update.emergelike("perl-cleaner", "all")', 'condition': was_installed('dev-lang/perl$', log_names['perl_cleaner']), @@ -140,7 +142,7 @@ class ClUpdateAction(Action): ] }, {'name': 'update:update_world', - 'group': __("Updating packages"), + 'group': __("Updating the list packages"), 'tasks': [ {'name': 'update:update_world', 'message': __("Calculating dependencies"), @@ -152,7 +154,7 @@ class ClUpdateAction(Action): 'group': __("Cleaning system from needless packages"), 'tasks': [ {'name': 'update_other:update_depclean', - 'message': __("Emerge depclean"), + 'message': __("Calculating dependencies"), 'method': 'Update.depclean()', 'condition': was_installed('.*', log_names['depclean']), 'decoration': 'Update.update_task("%s")' % log_names['depclean']