[yum-git] po/ru.po po/yum.pot yum/depsolve.py
Tim Lauridsen
timlau at linux.duke.edu
Sun Jan 27 18:54:12 UTC 2008
po/ru.po | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++------
po/yum.pot | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++
yum/depsolve.py | 92 +++++++++++------------
3 files changed, 441 insertions(+), 67 deletions(-)
New commits:
commit a155e22514bbe98e0fec9b6c349e9d1c255893c1
Author: Tim Lauridsen <tim at naboo.local>
Date: Sun Jan 27 19:53:44 2008 +0100
add _() translation wrappers to depsolve.py and refreshed yum.pot & po files
diff --git a/po/ru.po b/po/ru.po
index 52a3693..4c64ce1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-26 15:54+0100\n"
+"POT-Creation-Date: 2008-01-27 19:52+0100\n"
"PO-Revision-Date: 2003-10-14 15:36+0400\n"
"Last-Translator: Grigory Bakunov <black at asplinux.ru>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -172,6 +172,204 @@ msgstr ""
msgid "Error: more than one file given as argument to shell."
msgstr ""
+#: ../yum/depsolve.py:70
+msgid "doTsSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/depsolve.py:83
+msgid "Setting up TransactionSets before config class is up"
+msgstr ""
+
+#: ../yum/depsolve.py:123
+#, python-format
+msgid "Invalid tsflag in config file: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:134
+#, fuzzy, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "Удаление пакетов"
+
+#: ../yum/depsolve.py:163
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr ""
+
+#: ../yum/depsolve.py:171
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:212
+#, fuzzy, python-format
+msgid "Member: %s"
+msgstr "Сервер: %s"
+
+#: ../yum/depsolve.py:226 ../yum/depsolve.py:776
+#, python-format
+msgid "%s converted to install"
+msgstr ""
+
+#: ../yum/depsolve.py:233
+#, fuzzy, python-format
+msgid "Adding Package %s in mode %s"
+msgstr "Ðет пакета %s, %s"
+
+#: ../yum/depsolve.py:243
+#, fuzzy, python-format
+msgid "Removing Package %s"
+msgstr "ПоиÑк обновленных пакетов"
+
+#: ../yum/depsolve.py:254
+#, python-format
+msgid "%s requires: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:288
+msgid "Needed Require has already been looked up, cheating"
+msgstr ""
+
+#: ../yum/depsolve.py:298
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:305
+#, python-format
+msgid "Potential Provider: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:328
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:332
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:336
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr ""
+
+#: ../yum/depsolve.py:349
+#, python-format
+msgid "Looking for Obsoletes for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:361
+#, python-format
+msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+msgstr ""
+
+#: ../yum/depsolve.py:392
+#, python-format
+msgid "TSINFO: Updating %s to resolve dep."
+msgstr ""
+
+#. if there's no update then pass this over to requringFromTransaction()
+#: ../yum/depsolve.py:396
+#, fuzzy, python-format
+msgid "Cannot find an update path for dep for: %s"
+msgstr "Hе удаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ пакет Ñовпадающий Ñ %s"
+
+#: ../yum/depsolve.py:408
+#, python-format
+msgid "Unresolvable requirement %s for %s"
+msgstr ""
+
+#. is it already installed?
+#: ../yum/depsolve.py:454
+#, python-format
+msgid "%s is in providing packages but it is already installed, removing."
+msgstr ""
+
+#: ../yum/depsolve.py:469
+#, python-format
+msgid "Potential resolving package %s has newer instance in ts."
+msgstr ""
+
+#: ../yum/depsolve.py:480
+#, python-format
+msgid "Potential resolving package %s has newer instance installed."
+msgstr ""
+
+#: ../yum/depsolve.py:488 ../yum/depsolve.py:556
+#, python-format
+msgid "Missing Dependency: %s is needed by package %s"
+msgstr ""
+
+#: ../yum/depsolve.py:501
+#, python-format
+msgid "%s already in ts, skipping this one"
+msgstr ""
+
+#: ../yum/depsolve.py:566
+#, python-format
+msgid "TSINFO: Marking %s as update for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:573
+#, python-format
+msgid "TSINFO: Marking %s as install for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:642
+#, python-format
+msgid "unable to find newer package for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:649
+#, python-format
+msgid "TSINFO: Updating %s to resolve conflict."
+msgstr ""
+
+#: ../yum/depsolve.py:659
+#, fuzzy, python-format
+msgid "%s conflicts: %s"
+msgstr "завиÑимоÑти: пакет %s конфликтует Ñ %s"
+
+#: ../yum/depsolve.py:669
+#, fuzzy, python-format
+msgid "%s conflicts with %s"
+msgstr "завиÑимоÑти: пакет %s конфликтует Ñ %s"
+
+#: ../yum/depsolve.py:708 ../yum/depsolve.py:794
+msgid "Success - empty transaction"
+msgstr ""
+
+#: ../yum/depsolve.py:753 ../yum/depsolve.py:766
+msgid "Restarting Loop"
+msgstr ""
+
+#: ../yum/depsolve.py:782
+#, fuzzy
+msgid "Dependency Process ending"
+msgstr "ЗавиÑимоÑти разрешены"
+
+#: ../yum/depsolve.py:788
+#, python-format
+msgid "%s from %s has depsolving problems"
+msgstr ""
+
+#: ../yum/depsolve.py:795
+msgid "Success - deps resolved"
+msgstr ""
+
+#: ../yum/depsolve.py:812
+#, fuzzy, python-format
+msgid "Checking deps for %s"
+msgstr ""
+"\n"
+"Проверка Ñигнатуры %s"
+
+#: ../yum/depsolve.py:868
+#, python-format
+msgid "looking for %s as a requirement of %s"
+msgstr ""
+
#: ../yum/__init__.py:114
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
@@ -680,9 +878,6 @@ msgstr "Плохой заголовок %s"
msgid "Error opening rpm %s - error %s"
msgstr "Ðевозможно открыть пакет %s - ошибка %s"
-#~ msgid "Dependencies resolved"
-#~ msgstr "ЗавиÑимоÑти разрешены"
-
#~ msgid "Directory of rpms must exist"
#~ msgstr "Должен ÑущеÑтвовать каталог Ñ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼Ð¸"
@@ -814,13 +1009,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid ""
#~ "\n"
-#~ "Checking sig on %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Проверка Ñигнатуры %s"
-
-#~ msgid ""
-#~ "\n"
#~ "ignoring bad rpm: %s"
#~ msgstr ""
#~ "\n"
@@ -1139,9 +1327,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "[update: %s]"
#~ msgstr "[обновить: %s]"
-#~ msgid "Cannot find a package matching %s"
-#~ msgstr "Hе удаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ пакет Ñовпадающий Ñ %s"
-
#~ msgid "ERROR: Url Return no Content-Length - something is wrong"
#~ msgstr "ОШИБКÐ: URL не возвращает параметр Content-Length - что-то не так"
@@ -1188,9 +1373,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Group : %s"
#~ msgstr "Группа: %s"
-#~ msgid "Server: %s"
-#~ msgstr "Сервер: %s"
-
#~ msgid "No bootloader found, Cannot configure kernel."
#~ msgstr "Загрузчик не найден, загрузка нового Ñдра не наÑтроена."
@@ -1218,9 +1400,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Nothing in any group to update or install"
#~ msgstr "Ðечего обновлÑÑ‚ÑŒ или уÑтанавливать"
-#~ msgid "No Package %s, %s"
-#~ msgstr "Ðет пакета %s, %s"
-
#~ msgid "No Packages Available for Update"
#~ msgstr "Ðет пакетов доÑтупных Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
diff --git a/po/yum.pot b/po/yum.pot
index a3917c4..f60af25 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-26 15:54+0100\n"
+"POT-Creation-Date: 2008-01-27 19:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -165,6 +165,201 @@ msgstr ""
msgid "Error: more than one file given as argument to shell."
msgstr ""
+#: ../yum/depsolve.py:70
+msgid "doTsSetup() will go away in a future version of Yum.\n"
+msgstr ""
+
+#: ../yum/depsolve.py:83
+msgid "Setting up TransactionSets before config class is up"
+msgstr ""
+
+#: ../yum/depsolve.py:123
+#, python-format
+msgid "Invalid tsflag in config file: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:134
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:163
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr ""
+
+#: ../yum/depsolve.py:171
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:212
+#, python-format
+msgid "Member: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:226 ../yum/depsolve.py:776
+#, python-format
+msgid "%s converted to install"
+msgstr ""
+
+#: ../yum/depsolve.py:233
+#, python-format
+msgid "Adding Package %s in mode %s"
+msgstr ""
+
+#: ../yum/depsolve.py:243
+#, python-format
+msgid "Removing Package %s"
+msgstr ""
+
+#: ../yum/depsolve.py:254
+#, python-format
+msgid "%s requires: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:288
+msgid "Needed Require has already been looked up, cheating"
+msgstr ""
+
+#: ../yum/depsolve.py:298
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:305
+#, python-format
+msgid "Potential Provider: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:328
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:332
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:336
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr ""
+
+#: ../yum/depsolve.py:349
+#, python-format
+msgid "Looking for Obsoletes for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:361
+#, python-format
+msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+msgstr ""
+
+#: ../yum/depsolve.py:392
+#, python-format
+msgid "TSINFO: Updating %s to resolve dep."
+msgstr ""
+
+#. if there's no update then pass this over to requringFromTransaction()
+#: ../yum/depsolve.py:396
+#, python-format
+msgid "Cannot find an update path for dep for: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:408
+#, python-format
+msgid "Unresolvable requirement %s for %s"
+msgstr ""
+
+#. is it already installed?
+#: ../yum/depsolve.py:454
+#, python-format
+msgid "%s is in providing packages but it is already installed, removing."
+msgstr ""
+
+#: ../yum/depsolve.py:469
+#, python-format
+msgid "Potential resolving package %s has newer instance in ts."
+msgstr ""
+
+#: ../yum/depsolve.py:480
+#, python-format
+msgid "Potential resolving package %s has newer instance installed."
+msgstr ""
+
+#: ../yum/depsolve.py:488 ../yum/depsolve.py:556
+#, python-format
+msgid "Missing Dependency: %s is needed by package %s"
+msgstr ""
+
+#: ../yum/depsolve.py:501
+#, python-format
+msgid "%s already in ts, skipping this one"
+msgstr ""
+
+#: ../yum/depsolve.py:566
+#, python-format
+msgid "TSINFO: Marking %s as update for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:573
+#, python-format
+msgid "TSINFO: Marking %s as install for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:635 ../yum/depsolve.py:642
+#, python-format
+msgid "unable to find newer package for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:649
+#, python-format
+msgid "TSINFO: Updating %s to resolve conflict."
+msgstr ""
+
+#: ../yum/depsolve.py:659
+#, python-format
+msgid "%s conflicts: %s"
+msgstr ""
+
+#: ../yum/depsolve.py:669
+#, python-format
+msgid "%s conflicts with %s"
+msgstr ""
+
+#: ../yum/depsolve.py:708 ../yum/depsolve.py:794
+msgid "Success - empty transaction"
+msgstr ""
+
+#: ../yum/depsolve.py:753 ../yum/depsolve.py:766
+msgid "Restarting Loop"
+msgstr ""
+
+#: ../yum/depsolve.py:782
+msgid "Dependency Process ending"
+msgstr ""
+
+#: ../yum/depsolve.py:788
+#, python-format
+msgid "%s from %s has depsolving problems"
+msgstr ""
+
+#: ../yum/depsolve.py:795
+msgid "Success - deps resolved"
+msgstr ""
+
+#: ../yum/depsolve.py:812
+#, python-format
+msgid "Checking deps for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:868
+#, python-format
+msgid "looking for %s as a requirement of %s"
+msgstr ""
+
#: ../yum/__init__.py:114
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 04d54bc..f5bcce7 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -35,7 +35,7 @@ from constants import *
import packages
import logginglevels
import Errors
-
+from i18n import _
import warnings
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
@@ -67,7 +67,7 @@ class Depsolve(object):
self.installedUnresolvedFileRequires = None
def doTsSetup(self):
- warnings.warn('doTsSetup() will go away in a future version of Yum.\n',
+ warnings.warn(_('doTsSetup() will go away in a future version of Yum.\n'),
Errors.YumFutureDeprecationWarning, stacklevel=2)
return self._getTs()
@@ -80,7 +80,7 @@ class Depsolve(object):
return
if not self.conf.installroot:
- raise Errors.YumBaseError, 'Setting up TransactionSets before config class is up'
+ raise Errors.YumBaseError, _('Setting up TransactionSets before config class is up')
self._getTsInfo()
self.initActionTs()
@@ -120,7 +120,7 @@ class Depsolve(object):
if ts_flags_to_rpm.has_key(flag):
self._ts.addTsFlag(ts_flags_to_rpm[flag])
else:
- self.logger.critical('Invalid tsflag in config file: %s', flag)
+ self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
probfilter = 0
for flag in self.tsInfo.probFilterFlags:
@@ -131,7 +131,7 @@ class Depsolve(object):
"""searches the packageSacks for what provides the arguments
returns a ListPackageSack of providing packages, possibly empty"""
- self.verbose_logger.log(logginglevels.DEBUG_1, 'Searching pkgSack for dep: %s',
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('Searching pkgSack for dep: %s'),
name)
# we need to check the name - if it doesn't match:
# /etc/* bin/* or /usr/lib/sendmail then we should fetch the
@@ -160,7 +160,7 @@ class Depsolve(object):
for po in pkgs:
self.verbose_logger.log(logginglevels.DEBUG_2,
- 'Potential match for %s from %s', name, po)
+ _('Potential match for %s from %s'), name, po)
if name[0] == '/' and r_v is None:
# file dep add all matches to the defSack
defSack.addPackage(po)
@@ -168,7 +168,7 @@ class Depsolve(object):
if po.checkPrco('provides', (name, flags, (r_e, r_v, r_r))):
defSack.addPackage(po)
- self.verbose_logger.debug('Matched %s to require for %s', po, name)
+ self.verbose_logger.debug(_('Matched %s to require for %s'), po, name)
return defSack
@@ -209,7 +209,7 @@ class Depsolve(object):
ts_elem[(pkginfo, mode)] = 1
for txmbr in self.tsInfo.getMembers():
- self.verbose_logger.log(logginglevels.DEBUG_3, 'Member: %s', txmbr)
+ self.verbose_logger.log(logginglevels.DEBUG_3, _('Member: %s'), txmbr)
if txmbr.ts_state in ['u', 'i']:
if ts_elem.has_key((txmbr.pkgtup, 'i')):
continue
@@ -223,14 +223,14 @@ class Depsolve(object):
if txmbr.ts_state == 'u':
if self.allowedMultipleInstalls(txmbr.po):
self.verbose_logger.log(logginglevels.DEBUG_2,
- '%s converted to install', txmbr.po)
+ _('%s converted to install'), txmbr.po)
txmbr.ts_state = 'i'
txmbr.output_state = TS_INSTALL
self.ts.addInstall(hdr, (hdr, rpmfile), txmbr.ts_state)
self.verbose_logger.log(logginglevels.DEBUG_1,
- 'Adding Package %s in mode %s', txmbr.po, txmbr.ts_state)
+ _('Adding Package %s in mode %s'), txmbr.po, txmbr.ts_state)
if self.dsCallback:
self.dsCallback.pkgAdded(txmbr.pkgtup, txmbr.ts_state)
@@ -240,7 +240,7 @@ class Depsolve(object):
self.ts.addErase(txmbr.po.idx)
if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
self.verbose_logger.log(logginglevels.DEBUG_1,
- 'Removing Package %s', txmbr.po)
+ _('Removing Package %s'), txmbr.po)
def _processReq(self, po, requirement):
"""processes a Requires dep from the resolveDeps functions, returns a tuple
@@ -251,7 +251,7 @@ class Depsolve(object):
needname, flags, needversion = requirement
niceformatneed = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
- self.verbose_logger.log(logginglevels.DEBUG_1, '%s requires: %s', po, niceformatneed)
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('%s requires: %s'), po, niceformatneed)
if self.dsCallback: self.dsCallback.procReq(po.name, niceformatneed)
if po.repo.id != "installed":
@@ -285,7 +285,7 @@ class Depsolve(object):
providers = []
if self.cheaterlookup.has_key((needname, needflags, needversion)):
- self.verbose_logger.log(logginglevels.DEBUG_2, 'Needed Require has already been looked up, cheating')
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('Needed Require has already been looked up, cheating'))
cheater_po = self.cheaterlookup[(needname, needflags, needversion)]
providers = [cheater_po]
@@ -295,14 +295,14 @@ class Depsolve(object):
providers.append(txmbr.po)
else:
- self.verbose_logger.log(logginglevels.DEBUG_2, 'Needed Require is not a package name. Looking up: %s', niceformatneed)
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('Needed Require is not a package name. Looking up: %s'), niceformatneed)
providers = self.rpmdb.getProvides(needname, needflags, needversion)
for inst_po in providers:
inst_str = '%s.%s %s:%s-%s' % inst_po.pkgtup
(i_n, i_a, i_e, i_v, i_r) = inst_po.pkgtup
self.verbose_logger.log(logginglevels.DEBUG_2,
- 'Potential Provider: %s', inst_str)
+ _('Potential Provider: %s'), inst_str)
thismode = self.tsInfo.getMode(name=i_n, arch=i_a,
epoch=i_e, ver=i_v, rel=i_r)
@@ -325,15 +325,15 @@ class Depsolve(object):
needmode = thismode
self.cheaterlookup[(needname, needflags, needversion)] = inst_po
- self.verbose_logger.log(logginglevels.DEBUG_2, 'Mode is %s for provider of %s: %s',
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('Mode is %s for provider of %s: %s'),
needmode, niceformatneed, inst_str)
break
- self.verbose_logger.log(logginglevels.DEBUG_2, 'Mode for pkg providing %s: %s',
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('Mode for pkg providing %s: %s'),
niceformatneed, needmode)
if needmode in ['e']:
- self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: %s package requiring %s marked as erase',
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('TSINFO: %s package requiring %s marked as erase'),
requiringPo, needname)
txmbr = self.tsInfo.addErase(requiringPo)
txmbr.setAsDep(po=inst_po)
@@ -346,7 +346,7 @@ class Depsolve(object):
if self.up.obsoleted_dict.has_key(requiringPo.pkgtup):
obslist = self.up.obsoleted_dict[requiringPo.pkgtup]
self.verbose_logger.log(logginglevels.DEBUG_1,
- 'Looking for Obsoletes for %s', requiringPo)
+ _('Looking for Obsoletes for %s'), requiringPo)
if len(obslist) > 0:
po = None
@@ -358,7 +358,7 @@ class Depsolve(object):
txmbr = self.tsInfo.addObsoleting(po, requiringPo)
self.tsInfo.addObsoleted(requiringPo, po)
txmbr.setAsDep(po=needpo)
- self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: Obsoleting %s with %s to resolve dep.',
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('TSINFO: Obsoleting %s with %s to resolve dep.'),
requiringPo, po)
checkdeps = 1
return checkdeps, missingdep
@@ -389,11 +389,11 @@ class Depsolve(object):
txmbr = self.tsInfo.addUpdate(po, requiringPo)
txmbr.setAsDep(po=needpo)
txmbr.reason = "dep"
- self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: Updating %s to resolve dep.', po)
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('TSINFO: Updating %s to resolve dep.'), po)
checkdeps = 1
else: # if there's no update then pass this over to requringFromTransaction()
- self.verbose_logger.log(logginglevels.DEBUG_2, 'Cannot find an update path for dep for: %s', niceformatneed)
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('Cannot find an update path for dep for: %s'), niceformatneed)
reqpkg = (name, ver, rel, None)
return self._requiringFromTransaction(requiringPo, requirement, errorlist)
@@ -405,7 +405,7 @@ class Depsolve(object):
return self._requiringFromTransaction(requiringPo, requirement, errorlist)
else:
prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = 'Unresolvable requirement %s for %s' % (niceformatneed,
+ msg = _('Unresolvable requirement %s for %s') % (niceformatneed,
prob_pkg)
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
checkdeps = 0
@@ -451,7 +451,7 @@ class Depsolve(object):
for pkg in provSack.returnPackages():
if pkg.pkgtup in self.rpmdb.simplePkgList(): # is it already installed?
- self.verbose_logger.log(logginglevels.DEBUG_2, '%s is in providing packages but it is already installed, removing.', pkg)
+ self.verbose_logger.log(logginglevels.DEBUG_2, _('%s is in providing packages but it is already installed, removing.'), pkg)
provSack.delPackage(pkg)
continue
@@ -466,7 +466,7 @@ class Depsolve(object):
tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
for tspkg in tspkgs:
if tspkg.po.EVR > pkg.EVR:
- msg = 'Potential resolving package %s has newer instance in ts.' % pkg
+ msg = _('Potential resolving package %s has newer instance in ts.') % pkg
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
provSack.delPackage(pkg)
continue
@@ -477,7 +477,7 @@ class Depsolve(object):
dbpkgs = self.rpmdb.searchNevra(name=pkg.name, arch=pkg.arch)
for dbpkg in dbpkgs:
if dbpkg.EVR > pkg.EVR:
- msg = 'Potential resolving package %s has newer instance installed.' % pkg
+ msg = _('Potential resolving package %s has newer instance installed.') % pkg
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
provSack.delPackage(pkg)
continue
@@ -485,7 +485,7 @@ class Depsolve(object):
if len(provSack) == 0: # unresolveable
missingdep = 1
prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = 'Missing Dependency: %s is needed by package %s' % \
+ msg = _('Missing Dependency: %s is needed by package %s') % \
(rpmUtils.miscutils.formatRequire(needname, needversion, needflags),
prob_pkg)
errorlist.append(msg)
@@ -498,7 +498,7 @@ class Depsolve(object):
pkgmode = self.tsInfo.getMode(name=n, arch=a, epoch=e, ver=v, rel=r)
if pkgmode in ['i', 'u']:
self.verbose_logger.log(logginglevels.DEBUG_2,
- '%s already in ts, skipping this one', pkg)
+ _('%s already in ts, skipping this one'), pkg)
# FIXME: Remove this line, if it is not needed ?
# checkdeps = 1
return checkdeps, missingdep
@@ -553,7 +553,7 @@ class Depsolve(object):
missingdep = 1
checkdeps = 0
prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = 'Missing Dependency: %s is needed by package %s' % (needname, prob_pkg)
+ msg = _('Missing Dependency: %s is needed by package %s') % (needname, prob_pkg)
errorlist.append(msg)
return checkdeps, missingdep
@@ -563,14 +563,14 @@ class Depsolve(object):
# and know what needs it that way and provide a more sensible dep structure in the txmbr
inst = self.rpmdb.searchNevra(name=best.name, arch=best.arch)
if len(inst) > 0:
- self.verbose_logger.debug('TSINFO: Marking %s as update for %s' %(best,
+ self.verbose_logger.debug(_('TSINFO: Marking %s as update for %s') %(best,
requiringPo))
# FIXME: we should probably handle updating multiple packages...
txmbr = self.tsInfo.addUpdate(best, inst[0])
txmbr.setAsDep(po=requiringPo)
txmbr.reason = "dep"
else:
- self.verbose_logger.debug('TSINFO: Marking %s as install for %s', best,
+ self.verbose_logger.debug(_('TSINFO: Marking %s as install for %s'), best,
requiringPo)
txmbr = self.tsInfo.addInstall(best)
txmbr.setAsDep(po=requiringPo)
@@ -632,21 +632,21 @@ class Depsolve(object):
a = rpmUtils.arch.getBestArchFromList(archs.keys())
po = archs[a]
except Errors.PackageSackError:
- self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s" %(confpkg,))
+ self.verbose_logger.log(logginglevels.DEBUG_4, _("unable to find newer package for %s") %(confpkg,))
pkgs = []
po = None
else:
try:
po = self.pkgSack.returnNewestByNameArch((confpkg.name,confpkg.arch))[0]
except Errors.PackageSackError:
- self.verbose_logger.log(logginglevels.DEBUG_4, "unable to find newer package for %s" %(confpkg))
+ self.verbose_logger.log(logginglevels.DEBUG_4, _("unable to find newer package for %s") %(confpkg))
po = None
if po and po.pkgtup not in uplist:
po = None
if po:
self.verbose_logger.log(logginglevels.DEBUG_2,
- 'TSINFO: Updating %s to resolve conflict.', po)
+ _('TSINFO: Updating %s to resolve conflict.'), po)
txmbr = self.tsInfo.addUpdate(po, confpkg)
txmbr.setAsDep(po=requiringPo)
txmbr.reason = "dep"
@@ -656,7 +656,7 @@ class Depsolve(object):
conf = rpmUtils.miscutils.formatRequire(needname, needversion, flags)
prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
CheckDeps, conflicts = self._unresolveableConflict(conf, prob_pkg, errormsgs)
- self.verbose_logger.log(logginglevels.DEBUG_1, '%s conflicts: %s',
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('%s conflicts: %s'),
prob_pkg, conf)
if conflicts:
self.po_with_problems.add((requiringPo,None,errormsgs[-1]))
@@ -666,7 +666,7 @@ class Depsolve(object):
def _unresolveableConflict(self, conf, name, errors):
CheckDeps = 0
conflicts = 1
- msg = '%s conflicts with %s' % (name, conf)
+ msg = _('%s conflicts with %s') % (name, conf)
errors.append(msg)
return CheckDeps, conflicts
@@ -705,7 +705,7 @@ class Depsolve(object):
def resolveDeps(self):
if not len(self.tsInfo):
- return (0, ['Success - empty transaction'])
+ return (0, [_('Success - empty transaction')])
# holder object for things from the check
if not hasattr(self, '_dcobj'):
@@ -750,7 +750,7 @@ class Depsolve(object):
if CheckDeps:
if self.dsCallback: self.dsCallback.restartLoop()
- self.verbose_logger.log(logginglevels.DEBUG_1, 'Restarting Loop')
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('Restarting Loop'))
continue
# check Conflicts
@@ -763,7 +763,7 @@ class Depsolve(object):
if CheckDeps:
if self.dsCallback: self.dsCallback.restartLoop()
- self.verbose_logger.log(logginglevels.DEBUG_1, 'Restarting Loop')
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('Restarting Loop'))
continue
break
@@ -773,26 +773,26 @@ class Depsolve(object):
if self.allowedMultipleInstalls(txmbr.po) and \
txmbr.ts_state == 'u':
self.verbose_logger.log(logginglevels.DEBUG_2,
- '%s converted to install',
+ _('%s converted to install'),
txmbr.po)
txmbr.ts_state = 'i'
txmbr.output_state = TS_INSTALL
if self.dsCallback: self.dsCallback.end()
- self.verbose_logger.log(logginglevels.DEBUG_1, 'Dependency Process ending')
+ self.verbose_logger.log(logginglevels.DEBUG_1, _('Dependency Process ending'))
self.tsInfo.changed = False
if len(errors) > 0:
errors = unique(errors)
for po,wpo,err in self.po_with_problems:
- self.verbose_logger.info("%s from %s has depsolving problems" % (po,po.repoid))
+ self.verbose_logger.info(_("%s from %s has depsolving problems") % (po,po.repoid))
self.verbose_logger.info(" --> %s" % (err))
return (1, errors)
if len(self.tsInfo) > 0:
if not len(self.tsInfo):
- return (0, ['Success - empty transaction'])
- return (2, ['Success - deps resolved'])
+ return (0, [_('Success - empty transaction')])
+ return (2, [_('Success - deps resolved')])
def _resolveRequires(self, errors):
any_missing = False
@@ -809,7 +809,7 @@ class Depsolve(object):
if self.dsCallback and txmbr.ts_state:
self.dsCallback.pkgAdded(txmbr.pkgtup, txmbr.ts_state)
self.verbose_logger.log(logginglevels.DEBUG_2,
- "Checking deps for %s" %(txmbr,))
+ _("Checking deps for %s") %(txmbr,))
# store the primary po we currently are working on
# so we can store it in self.po_with_problems.
@@ -865,7 +865,7 @@ class Depsolve(object):
if req in oldreqs and self.rpmdb.getProvides(*req):
continue
- self.verbose_logger.log(logginglevels.DEBUG_2, "looking for %s as a requirement of %s", req, txmbr)
+ self.verbose_logger.log(logginglevels.DEBUG_2, _("looking for %s as a requirement of %s"), req, txmbr)
provs = self.tsInfo.getProvides(*req)
if not provs:
reqtuple = (req[0], version_tuple_to_string(req[2]), flags[req[1]])
More information about the Yum-cvs-commits
mailing list