rpms/yum/devel yum-HEAD.patch,1.60,1.61 yum.spec,1.322,1.323
James Antill
james at fedoraproject.org
Fri Jun 25 21:35:52 UTC 2010
Author: james
Update of /cvs/pkgs/rpms/yum/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17145
Modified Files:
yum-HEAD.patch yum.spec
Log Message:
* Fri Jun 25 2010 James Antill <james at fedoraproject.org> - 3.2.27-17
- Latest head.
- Allow reinstalls of kernel, etc.
- Tweaks to some user output.
- Allow Fedora GPG keys to be removed.
- Add history extra data API, and history plugin hooks.
- Bunch of minor bug fixes.
yum-HEAD.patch:
Makefile | 2
b/Makefile | 2
b/cli.py | 63
b/docs/yum.8 | 10
b/docs/yum.conf.5 | 5
b/etc/Makefile | 1
b/etc/yum.bash | 7
b/output.py | 39
b/po/cs.po | 1406 ++++++++++++---------
b/po/en_GB.po | 2711 ++++++++++++++++++++++++++++++++++++++++-
b/po/fi.po | 204 +--
b/po/pt_BR.po | 1724 +++++++++++++++-----------
b/po/ru.po | 13
b/po/sv.po | 1423 ++++++++++++---------
b/po/uk.po | 2632 +++++++++++++++++++++++++++++++++++++++
b/rpmUtils/miscutils.py | 45
b/rpmUtils/oldUtils.py | 2
b/rpmUtils/transaction.py | 7
b/rpmUtils/updates.py | 13
b/test/depsolvetests.py | 16
b/test/packagetests.py | 2
b/test/simpleobsoletestests.py | 19
b/test/simpleupdatetests.py | 41
b/test/testbase.py | 2
b/test/yum-leak-test.py | 55
b/test/yum-pylintrc | 3
b/utils.py | 3
b/yum-updatesd.py | 8
b/yum.spec | 3
b/yum/__init__.py | 11
b/yum/comps.py | 21
b/yum/config.py | 3
b/yum/depsolve.py | 12
b/yum/history.py | 35
b/yum/logginglevels.py | 3
b/yum/mdparser.py | 2
b/yum/metalink.py | 6
b/yum/misc.py | 9
b/yum/packageSack.py | 32
b/yum/packages.py | 16
b/yum/pgpmsg.py | 3
b/yum/pkgtag_db.py | 4
b/yum/plugins.py | 3
b/yum/repoMDObject.py | 93 +
b/yum/repos.py | 2
b/yum/rpmsack.py | 17
b/yum/sqlitesack.py | 27
b/yum/transactioninfo.py | 11
b/yum/update_md.py | 5
b/yum/yumRepo.py | 9
b/yumcommands.py | 23
b/yummain.py | 11
cli.py | 103 +
docs/yum.8 | 48
docs/yum.conf.5 | 86 +
etc/Makefile | 1
etc/yum.bash | 18
output.py | 415 ++++--
po/fi.po | 5
po/ru.po | 1303 +++++++++----------
po/sv.po | 157 --
po/uk.po | 825 +++++++-----
rpmUtils/miscutils.py | 25
rpmUtils/transaction.py | 10
rpmUtils/updates.py | 45
test/simpleobsoletestests.py | 6
test/simpleupdatetests.py | 6
test/testbase.py | 22
test/yum-leak-test.py | 57
utils.py | 28
yum.spec | 28
yum/__init__.py | 693 +++++++---
yum/comps.py | 6
yum/config.py | 122 +
yum/depsolve.py | 188 ++
yum/history.py | 389 +++++
yum/logginglevels.py | 59
yum/metalink.py | 6
yum/misc.py | 168 +-
yum/packageSack.py | 46
yum/packages.py | 172 +-
yum/pgpmsg.py | 17
yum/plugins.py | 8
yum/repoMDObject.py | 11
yum/rpmsack.py | 278 +++-
yum/sqlitesack.py | 162 +-
yum/transactioninfo.py | 77 -
yum/update_md.py | 26
yum/yumRepo.py | 52
yumcommands.py | 23
90 files changed, 12260 insertions(+), 4250 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.60 -r 1.61 yum-HEAD.patchIndex: yum-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum-HEAD.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- yum-HEAD.patch 16 Jun 2010 04:54:49 -0000 1.60
+++ yum-HEAD.patch 25 Jun 2010 21:35:49 -0000 1.61
@@ -31805,3 +31805,3877 @@ index a676773..ca87335 100644
--
1.7.0.1
+
+From 98a816aee6fcad44bcc3461d42124c7db9864688 Mon Sep 17 00:00:00 2001
+From: Yuri Chornoivan <yurchor at ukr.net>
+Date: Wed, 16 Jun 2010 09:53:31 +0000
+Subject: [PATCH 198] l10n: Updated Ukrainian (uk) translation to 78%
+
+New status: 444 messages complete with 0 fuzzies and 125 untranslated.
+
+Transmitted-via: Transifex (www.transifex.net).
+---
+ po/uk.po | 573 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 files changed, 327 insertions(+), 246 deletions(-)
+
+diff --git a/po/uk.po b/po/uk.po
+index cba3072..0001d53 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -7,7 +7,7 @@ msgstr ""
+ "Project-Id-Version: \n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2010-02-11 10:54-0500\n"
+-"PO-Revision-Date: 2010-06-14 20:27+0300\n"
++"PO-Revision-Date: 2010-06-16 12:53+0300\n"
+ "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
+ "Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -76,58 +76,59 @@ msgstr "Очищення диска"
+ #: ../cli.py:107
+ #, python-format
+ msgid "Command \"%s\" already defined"
+-msgstr ""
++msgstr "Команду «%s» вже визначено"
+
+ #: ../cli.py:119
+ msgid "Setting up repositories"
+-msgstr ""
++msgstr "Налаштування сховищ"
+
+ #: ../cli.py:130
+ msgid "Reading repository metadata in from local files"
+-msgstr ""
++msgstr "Читання метаданих сховища з локальних файлів"
+
+ #: ../cli.py:194 ../utils.py:193
+ #, python-format
+ msgid "Config Error: %s"
+-msgstr ""
++msgstr "Помилка налаштування: %s"
+
+ #: ../cli.py:197 ../cli.py:1272 ../utils.py:196
+ #, python-format
+ msgid "Options Error: %s"
+-msgstr ""
++msgstr "Помилка у параметрах: %s"
+
+ #: ../cli.py:227
+ #, python-format
+ msgid " Installed: %s-%s at %s"
+-msgstr ""
++msgstr " Встановлено: %s-%s у %s"
+
+ #: ../cli.py:229
+ #, python-format
+ msgid " Built : %s at %s"
+-msgstr ""
++msgstr " Зібрано : %s о %s"
+
+ #: ../cli.py:231
+ #, python-format
+ msgid " Committed: %s at %s"
+-msgstr ""
++msgstr " Надіслано : %s о %s"
+
+ #: ../cli.py:270
+ msgid "You need to give some command"
+-msgstr ""
++msgstr "Вам слід вказати якусь команду"
+
+ #: ../cli.py:284
+ #, python-format
+ msgid "No such command: %s. Please use %s --help"
+-msgstr ""
++msgstr "Команди %s не виявлено. Будь ласка, скористайтеся командою %s --help"
+
+ #: ../cli.py:314
+ msgid "Disk Requirements:\n"
+-msgstr ""
++msgstr "Вимоги до диска:\n"
+
+ #: ../cli.py:316
+ #, python-format
+ msgid " At least %dMB more space needed on the %s filesystem.\n"
+ msgstr ""
++" Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n"
+
+ #. TODO: simplify the dependency errors?
+ #. Fixup the summary
+@@ -136,10 +137,14 @@ msgid ""
+ "Error Summary\n"
+ "-------------\n"
+ msgstr ""
++"Резюме помилок\n"
++"-------------\n"
+
+ #: ../cli.py:364
+ msgid "Trying to run the transaction but nothing to do. Exiting."
+ msgstr ""
++"Спроба виконання операції за умови порожнього списку операцій. Завершуємо "
++"роботу."
+
+ #: ../cli.py:403
+ msgid "Exiting on user Command"
+@@ -155,24 +160,24 @@ msgstr "Помилка завантаження пакетів:\n"
+
+ #: ../cli.py:426 ../yum/__init__.py:4195
+ msgid "Running rpm_check_debug"
+-msgstr ""
++msgstr "Виконання rpm_check_debug"
+
+ #: ../cli.py:435 ../yum/__init__.py:4204
+ msgid "ERROR You need to update rpm to handle:"
+-msgstr ""
++msgstr "ПОМИЛКА. Вам слід оновити rpm для обробки:"
+
+ #: ../cli.py:437 ../yum/__init__.py:4207
+ msgid "ERROR with rpm_check_debug vs depsolve:"
+-msgstr ""
++msgstr "ПОМИЛКА у rpm_check_debug через depsolve:"
+
+ #: ../cli.py:443
+ msgid "RPM needs to be updated"
+-msgstr ""
++msgstr "RPM слід оновити"
+
+ #: ../cli.py:444
+ #, python-format
+ msgid "Please report this error in %s"
+-msgstr ""
++msgstr "Будь ласка, повідомте про цю помилку за адресою %s"
+
+ #: ../cli.py:450
+ msgid "Running Transaction Test"
+@@ -180,7 +185,7 @@ msgstr "Запускається операція з перевірки"
+
+ #: ../cli.py:466
+ msgid "Transaction Check Error:\n"
+-msgstr ""
++msgstr "Помилка під час перевірки операції:\n"
+
+ #: ../cli.py:473
+ msgid "Transaction Test Succeeded"
+@@ -195,24 +200,26 @@ msgid ""
+ "Refusing to automatically import keys when running unattended.\n"
+ "Use \"-y\" to override."
+ msgstr ""
++"Автоматичне імпортування ключів під час некерованого запуску заборонено.\n"
++"Скасувати заборону можна параметром «-y»."
+
+ #: ../cli.py:544 ../cli.py:578
+ msgid " * Maybe you meant: "
+-msgstr ""
++msgstr " * Можливо, ви хотіли використати: "
+
+ #: ../cli.py:561 ../cli.py:569
+ #, python-format
+ msgid "Package(s) %s%s%s available, but not installed."
+-msgstr ""
++msgstr "Доступні невстановлені пакунки %s%s%s."
+
+ #: ../cli.py:575 ../cli.py:607 ../cli.py:687
+ #, python-format
+ msgid "No package %s%s%s available."
+-msgstr ""
++msgstr "Пакунок %s%s%s недоступний."
+
+ #: ../cli.py:612 ../cli.py:748
+ msgid "Package(s) to install"
+-msgstr ""
++msgstr "Пакунки, які слід встановити"
+
+ #: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+ #: ../yumcommands.py:160
+@@ -222,24 +229,24 @@ msgstr "Нічого виконувати"
+ #: ../cli.py:647
+ #, python-format
+ msgid "%d packages marked for Update"
+-msgstr ""
++msgstr "%d пакунків позначено для оновлення"
[...3486 lines suppressed...]
++ ' From : %s') %
++ (info['hexkeyid'], to_unicode(info['userid']),
++ pkgs, pkgs.ui_from_repo,
++ keyurl.replace("file://","")))
++ if msg is None:
++ msg = (_('Importing GPG key 0x%s:\n'
++ ' Userid: "%s"\n'
++ ' From : %s') %
++ (info['hexkeyid'], to_unicode(info['userid']),
++ keyurl.replace("file://","")))
++ self.logger.critical("%s", msg)
++
+ def getKeyForPackage(self, po, askcb = None, fullaskcb = None):
+ """
+ Retrieve a key for a package. If needed, prompt for if the key should
+@@ -4243,10 +4265,7 @@ class YumBase(depsolve.Depsolve):
+ continue
+
+ # Try installing/updating GPG key
+- self.logger.critical(_('Importing GPG key 0x%s "%s" from %s') %
+- (info['hexkeyid'],
+- to_unicode(info['userid']),
+- keyurl.replace("file://","")))
++ self._getKeyImportMessage(info, keyurl)
+ rc = False
+ if self.conf.assumeyes:
+ rc = True
+@@ -4305,10 +4324,7 @@ class YumBase(depsolve.Depsolve):
+ continue
+
+ # Try installing/updating GPG key
+- self.logger.critical(_('Importing GPG key 0x%s "%s" from %s') %
+- (info['hexkeyid'],
+- to_unicode(info['userid']),
+- keyurl.replace("file://","")))
++ self._getKeyImportMessage(info, keyurl)
+ rc = False
+ if self.conf.assumeyes:
+ rc = True
+--
+1.7.0.1
+
+
+From 64e0d8840b00a3d309b8348f5e69d33727b529d1 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Tue, 22 Jun 2010 16:20:48 -0400
+Subject: [PATCH 217] Fix the indentation on key_installed.
+
+---
+ yum/__init__.py | 28 +++++++++++++---------------
+ 1 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 1b24f24..7e593b4 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -4289,13 +4289,13 @@ class YumBase(depsolve.Depsolve):
+ self.logger.info(_('Key imported successfully'))
+ key_installed = True
+
+- if not key_installed:
+- raise Errors.YumBaseError, \
+- _('The GPG keys listed for the "%s" repository are ' \
+- 'already installed but they are not correct for this ' \
+- 'package.\n' \
+- 'Check that the correct key URLs are configured for ' \
+- 'this repository.') % (repo.name)
++ if not key_installed:
++ raise Errors.YumBaseError, \
++ _('The GPG keys listed for the "%s" repository are ' \
++ 'already installed but they are not correct for this ' \
++ 'package.\n' \
++ 'Check that the correct key URLs are configured for ' \
++ 'this repository.') % (repo.name)
+
+ # Check if the newly installed keys helped
+ result, errmsg = self.sigCheckPkg(po)
+@@ -4345,14 +4345,12 @@ class YumBase(depsolve.Depsolve):
+ self.logger.info(_('Key imported successfully'))
+ key_installed = True
+
+- if not key_installed:
+- raise Errors.YumBaseError, \
+- _('The GPG keys listed for the "%s" repository are ' \
+- 'already installed but they are not correct for this ' \
+- 'package.\n' \
+- 'Check that the correct key URLs are configured for ' \
+- 'this repository.') % (repo.name)
+-
++ if not key_installed:
++ raise Errors.YumBaseError, \
++ _('The GPG keys listed for the "%s" repository are ' \
++ 'already installed but they are not correct.\n' \
++ 'Check that the correct key URLs are configured for ' \
++ 'this repository.') % (repo.name)
+
+ def _limit_installonly_pkgs(self):
+ """ Limit packages based on conf.installonly_limit, if any of the
+--
+1.7.0.1
+
+
+From d2c16711a8eb069d72ca4a3bd73014ecffb43459 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Thu, 24 Jun 2010 00:39:43 -0400
+Subject: [PATCH 218] Fix make check, due to rpmdb.readOnlyTS() not being in FakeRpmDb.
+
+---
+ test/testbase.py | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/test/testbase.py b/test/testbase.py
+index 48611d8..f91fbf1 100644
+--- a/test/testbase.py
++++ b/test/testbase.py
+@@ -17,6 +17,7 @@ from cli import YumBaseCli
+ from yum.rpmsack import RPMDBPackageSack as _rpmdbsack
+ import inspect
+ from rpmUtils import arch
++from rpmUtils.transaction import initReadOnlyTransaction
+
+ #############################################################
+ ### Helper classes ##########################################
+@@ -293,6 +294,11 @@ class FakeRpmDb(packageSack.PackageSack):
+ def transactionReset(self):
+ return
+
++ def readOnlyTS(self):
++ # Should probably be able to "fake" this, so we can provide different
++ # get_running_kernel_pkgtup(). Bah.
++ return initReadOnlyTransaction("/")
++
+ def getProvides(self, name, flags=None, version=(None, None, None)):
+ """return dict { packages -> list of matching provides }"""
+ self._checkIndexes(failure='build')
+--
+1.7.0.1
+
+
+From 7161c68fd576f139fbc8c3f01f665dc149e2d039 Mon Sep 17 00:00:00 2001
+From: James Antill <james at and.org>
+Date: Thu, 24 Jun 2010 00:43:31 -0400
+Subject: [PATCH 219] Show a nice error message when a user tries to access history.
+
+---
+ yumcommands.py | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/yumcommands.py b/yumcommands.py
+index dcf72db..6b134a4 100644
+--- a/yumcommands.py
++++ b/yumcommands.py
+@@ -1331,6 +1331,9 @@ class HistoryCommand(YumCommand):
+ if extcmds and extcmds[0] in ('repeat', 'redo', 'undo', 'new'):
+ checkRootUID(base)
+ checkGPGKey(base)
++ elif not os.access(base.history._db_file, os.R_OK):
++ base.logger.critical(_("You don't have access to the history DB."))
++ raise cli.CliError
+
+ def doCommand(self, base, basecmd, extcmds):
+ vcmd = 'list'
+--
+1.7.0.1
+
+
+From a104bead7f2742d8077dba1e3b593a9f27ccc54f Mon Sep 17 00:00:00 2001
+From: Seth Vidal <skvidal at fedoraproject.org>
+Date: Fri, 25 Jun 2010 16:53:41 -0400
+Subject: [PATCH 220] stupid typo/thinkos in the write_addon_data method to history.
+
+---
+ yum/history.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/yum/history.py b/yum/history.py
+index f84ca61..91c6f8d 100644
+--- a/yum/history.py
++++ b/yum/history.py
+@@ -578,7 +578,7 @@ class YumHistory:
+ self._log_errors(errors)
+ del self._tid
+
+- def write_addon_data(dataname, data):
++ def write_addon_data(self, dataname, data):
+ """append data to an arbitrary-named file in the history
+ addon_path/transaction id location,
+ returns True if write succeeded, False if not"""
+@@ -594,7 +594,7 @@ class YumHistory:
+ return False
+
+ # make sure the tid dir exists
+- tid_dir = self.conf.addon_path + '/' + self._tid
++ tid_dir = self.conf.addon_path + '/' + str(self._tid)
+
+ if self.conf.writable and not os.path.exists(tid_dir):
+ try:
+--
+1.7.0.1
+
Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- yum.spec 16 Jun 2010 05:02:35 -0000 1.322
+++ yum.spec 25 Jun 2010 21:35:51 -0000 1.323
@@ -3,7 +3,7 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.27
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -133,6 +133,14 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/lib/yum-plugins
%changelog
+* Fri Jun 25 2010 James Antill <james at fedoraproject.org> - 3.2.27-17
+- Latest head.
+- Allow reinstalls of kernel, etc.
+- Tweaks to some user output.
+- Allow Fedora GPG keys to be removed.
+- Add history extra data API, and history plugin hooks.
+- Bunch of minor bug fixes.
+
* Tue Jun 15 2010 James Antill <james at fedoraproject.org> - 3.2.27-16
- Latest head.
- Fix install being recorded as reinstall.
More information about the scm-commits
mailing list