From e661a22e9d46bbc3be495f287773be49e27e9f44 Mon Sep 17 00:00:00 2001
From: Mike khiretskiy <mh@calculate.ru>
Date: Wed, 14 May 2014 18:00:57 +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=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 update/update.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/update/update.py b/update/update.py
index 77b1d9b..1dddd39 100644
--- a/update/update.py
+++ b/update/update.py
@@ -146,12 +146,14 @@ class Update:
                 if e.addon:
                     self.printWARNING(str(e.addon))
                 self.printWARNING(str(e))
-                self.printWARNING(
+                self.endTask(False)
+                self.startTask(
                     _("Re-fetch {name} repository").format(name=repname))
+                self.addProgress()
                 try:
                     rpath_new = "%s_new" % rpath
                     self._syncRepository(repname, url, rpath_new, revision,
-                                         branch)
+                                         branch, cb_progress=self.setProgress)
                     removeDir(rpath)
                     os.rename(rpath_new, rpath)
                 except OSError:
@@ -353,7 +355,7 @@ class Update:
 
     def _display_pretty_package_list(self, pkglist, remove_list=False):
         """
-        Отобразить список пакетов в "удобночитаемом" виде
+        Отобразить список пакетов в "удобочитаемом" виде
         """
         _print = self.color_print
         ebuild_color = TextState.Colors.GREEN
@@ -369,14 +371,19 @@ class Update:
                     pkgcolor = _print.foreground(binary_color)
                 else:
                     pkgcolor = _print.foreground(ebuild_color)
-            fullname = _(pkg.info['DESCRIPTION']).capitalize()
+
+            if pkg.info['DESCRIPTION']:
+                fullname = "%s " % _(pkg.info['DESCRIPTION'])
+                fullname = fullname[:1].upper()+fullname[1:]
+            else:
+                fullname = ""
             shortname = pkgcolor("%s-%s" % (pkg["CATEGORY/PN"], pkg["PVR"]))
             if "SIZE" in pkg and pkg['SIZE'] and pkg["SIZE"] != "0 kB":
                 size = " (%s)" % pkg["SIZE"]
             else:
                 size = ""
             mult = _print.bold("*")
-            self.printDefault("&nbsp;{mult} {fullname} {shortname}{size}".format(
+            self.printDefault("&nbsp;{mult} {fullname}{shortname}{size}".format(
                 mult=mult, fullname=fullname, shortname=shortname, size=size))
 
     def _display_install_package(self, emerge):
@@ -553,7 +560,7 @@ class Update:
                 self.printPre(self._emerge_translate(emerge.prepare_error))
                 raise
             if (self.askConfirm(
-                    _("Would you like to unmerge these packages?")) == 'no'):
+                    _("Would you like to unmerge these packages?")) != 'yes'):
                 return False
             self._startEmerging(emerge)
         return True