Исправлены строки для локализцаии. Исправлен вывод информации о автозависимых пакетах.

master-3.5
parent 2c9e2492ee
commit e5cd091d8c

@ -1406,8 +1406,8 @@ class Builder(Update):
key=lambda x:x[0])): key=lambda x:x[0])):
package, required_pkgs = data package, required_pkgs = data
self.startTask("Check (%d of %d) %s" % ( self.startTask(_("Check ({cur} of {maxval}) {package}").format(
i + 1, len(check_data), package)) cur=i + 1, maxval=len(check_data), package=package))
if not required_pkgs: if not required_pkgs:
self.endTask(True) self.endTask(True)
@ -1416,7 +1416,7 @@ class Builder(Update):
pretend = list(self.pretend_emerge_list(builder_path, package)) pretend = list(self.pretend_emerge_list(builder_path, package))
if not pretend: if not pretend:
self.endTask(False) self.endTask(False)
self.printERROR("Failed to receive package list") self.printERROR(_("Failed to receive package list"))
else: else:
# получаем список пакетов которые необходимых для работы # получаем список пакетов которые необходимых для работы
required_pkgs = [x for x in required_pkgs required_pkgs = [x for x in required_pkgs
@ -1460,18 +1460,21 @@ class Builder(Update):
for pkg, reqs in automagic.items(): for pkg, reqs in automagic.items():
if reqs: if reqs:
self.printWARNING( self.printWARNING(
"Auto depends for %s package by %s will be used" % ( _("Auto depends for {pkg} package by {pkgs} "
pkg, ",".join(str(x) for x in reqs))) "will be used").format(
for pkg, clear_req_pkgs in automagic_clear.items(): pkg=pkg, pkgs=",".join(str(x) for x in reqs)))
clear_req_pkgs = automagic_clear.get(pkg, [])
if clear_req_pkgs: if clear_req_pkgs:
self.printWARNING( self.printWARNING(
"Auto depends for %s package by %s will be clear" % ( _("Auto depends for {pkg} package by {pkgs} "
pkg, ",".join(str(x) for x in clear_req_pkgs))) "will be clear").format(
for pkg, waste_pkgs in automagic_waste.items(): pkg=pkg, pkgs=",".join(str(x) for x in clear_req_pkgs)))
waste_pkgs = automagic_waste.get(pkg, [])
if waste_pkgs: if waste_pkgs:
self.printWARNING( self.printWARNING(
"Specified depends for %s package by %s obsoleted" % ( _("Specified depends for {pkg} package by {pkgs} "
pkg, ",".join(waste_pkgs))) "obsoleted").format(
pkg=pkg, pkgs=",".join(waste_pkgs)))
def _rebuild_automagic(self, automagic, automagic_clear, builder_path): def _rebuild_automagic(self, automagic, automagic_clear, builder_path):
""" """

Loading…
Cancel
Save