|
|
|
@ -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(" {mult} {fullname} {shortname}{size}".format(
|
|
|
|
|
self.printDefault(" {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
|
|
|
|
|