rpms/yum/devel yum-big-head.patch, NONE, 1.1 yum.spec, 1.204, 1.205 yum-3.2.5-close.patch, 1.1, NONE yum-3.2.8-livecd-work.patch, 1.1, NONE yum-comps-write.patch, 1.1, NONE yum-mutual-obsoletes-providers.patch, 1.1, NONE yum-showasdep.patch, 1.1, NONE yum-trans-display-object.patch, 1.1, NONE yum-tsts.patch, 1.1, NONE
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Wed Apr 9 14:35:38 UTC 2008
Author: skvidal
Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790
Modified Files:
yum.spec
Added Files:
yum-big-head.patch
Removed Files:
yum-3.2.5-close.patch yum-3.2.8-livecd-work.patch
yum-comps-write.patch yum-mutual-obsoletes-providers.patch
yum-showasdep.patch yum-trans-display-object.patch
yum-tsts.patch
Log Message:
clean up all unused patches
add patch to merge in all fixes from HEAD
yum-big-head.patch:
--- NEW FILE yum-big-head.patch ---
diff --git a/output.py b/output.py
index 532a06e..8b975ee 100644
--- a/output.py
+++ b/output.py
@@ -29,7 +29,7 @@ import re # For YumTerm
from urlgrabber.progress import TextMeter
from urlgrabber.grabber import URLGrabError
-from yum.misc import sortPkgObj, prco_tuple_to_string
+from yum.misc import sortPkgObj, prco_tuple_to_string, to_str
from rpmUtils.miscutils import checkSignals
from yum.constants import *
@@ -253,7 +253,7 @@ class YumOutput:
def fmtKeyValFill(self, key, val):
""" Return a key value pair in the common two column output format. """
- val = str(val)
+ val = to_str(val)
keylen = len(key)
cols = self.term.columns
nxt = ' ' * (keylen - 2) + ': '
diff --git a/po/fr.po b/po/fr.po
index 60a8c1b..288f0fe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,4 +1,4 @@
-# translation of yum.master.po to Français
+# translation of yum.master.po to fr_FR
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: yum.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-26 02:10+0000\n"
-"PO-Revision-Date: 2008-03-31 20:49+0200\n"
-"Last-Translator: Thomas Canniot <mrtom at fedoraproject.org>\n"
-"Language-Team: Français <fedora-trans-fr at redhat.com>\n"
+"POT-Creation-Date: 2008-04-05 01:43+0000\n"
+"PO-Revision-Date: 2008-04-08 18:49+0200\n"
+"Last-Translator: Johan Cwiklinski <johan at x-tnd.be>\n"
+"Language-Team: fr_FR <fedora-trans-fr at redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../callback.py:48 ../output.py:512 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:513 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Mise à jour"
@@ -25,7 +25,7 @@ msgstr "Mise à jour"
msgid "Erasing"
msgstr "Suppression"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:512
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installation"
@@ -34,7 +34,7 @@ msgstr "Installation"
msgid "Obsoleted"
msgstr "Obsolète"
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:559
msgid "Updated"
msgstr "Mis à jour"
@@ -42,7 +42,7 @@ msgstr "Mis à jour"
msgid "Erased"
msgstr "Supprimé"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:557
msgid "Installed"
msgstr "Installé"
@@ -64,7 +64,7 @@ msgstr "Erreur : statut de sortie invalide : %s pour %s"
msgid "Erased: %s"
msgstr "Supprimé : %s"
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:514
msgid "Removing"
msgstr "Suppression"
@@ -90,7 +90,7 @@ msgstr "Lecture des méta données du dépôt depuis les fichiers locaux"
msgid "Config Error: %s"
msgstr "Erreur de configuration : %s"
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:186 ../cli.py:1070 ../utils.py:75
#, python-format
msgid "Options Error: %s"
msgstr "Erreur d'options : %s"
@@ -136,15 +136,15 @@ msgstr "Téléchargement des paquetages :"
msgid "Error Downloading Packages:\n"
msgstr "Erreur durant le téléchargement des paquetages :\n"
-#: ../cli.py:370 ../yum/__init__.py:2732
+#: ../cli.py:370 ../yum/__init__.py:2766
msgid "Running rpm_check_debug"
msgstr "Lancement de rpm_check_debug"
-#: ../cli.py:373 ../yum/__init__.py:2735
+#: ../cli.py:373 ../yum/__init__.py:2769
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ERREUR de résolution de dépendance par rpm_check_debug :"
-#: ../cli.py:377 ../yum/__init__.py:2737
+#: ../cli.py:377 ../yum/__init__.py:2771
msgid "Please report this error in bugzilla"
msgstr "Veuillez reporter cette erreur dans le bugzilla"
@@ -186,16 +186,16 @@ msgstr "Traitement des options d'installation des paquetages"
msgid "No package %s available."
msgstr "Aucun paquetage %s disponible."
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:777
msgid "Package(s) to install"
msgstr "Paquetage(s) Ã installer"
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:147 ../yumcommands.py:778
msgid "Nothing to do"
msgstr "Rien à faire"
-#: ../cli.py:536 ../yum/__init__.py:2218 ../yum/__init__.py:2297
-#: ../yum/__init__.py:2326
+#: ../cli.py:536 ../yum/__init__.py:2227 ../yum/__init__.py:2327
+#: ../yum/__init__.py:2339
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
@@ -338,85 +338,96 @@ msgstr "Pas d'autre %s installé, ajout à la liste pour installation potentiell
msgid "Command line error: %s"
msgstr "Erreur sur la ligne de commande : %s"
-#: ../cli.py:1101
+#: ../cli.py:983
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+"\n"
+"\n"
+"%s : l'option %s requiert un argument"
+
+#: ../cli.py:1103
msgid "be tolerant of errors"
msgstr "tolérer les erreurs"
-#: ../cli.py:1103
+#: ../cli.py:1105
msgid "run entirely from cache, don't update cache"
msgstr "exécuter entièrement depuis le cache, ne pas le mettre à jour"
-#: ../cli.py:1105
+#: ../cli.py:1107
msgid "config file location"
msgstr "emplacement du fichier de configuration"
-#: ../cli.py:1107
+#: ../cli.py:1109
msgid "maximum command wait time"
msgstr "temps d'attente maximum de la commande"
-#: ../cli.py:1109
+#: ../cli.py:1111
msgid "debugging output level"
msgstr "niveau de déboguage pour la sortie"
-#: ../cli.py:1113
+#: ../cli.py:1115
msgid "show duplicates, in repos, in list/search commands"
msgstr "afficher les doublons, dans les dépôts, pour les commandes lister/rechercher"
-#: ../cli.py:1115
+#: ../cli.py:1117
msgid "error output level"
msgstr "niveau d'erreur pour la sortie"
-#: ../cli.py:1118
+#: ../cli.py:1120
msgid "quiet operation"
msgstr "opération silencieuse"
-#: ../cli.py:1122
+#: ../cli.py:1124
msgid "answer yes for all questions"
msgstr "répondre oui à toutes les questions"
[...5462 lines suppressed...]
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:2643
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
+msgstr "Uvozim GPG kljuÄ 0x%s „%s“ iz %s"
+
+#: ../yum/__init__.py:2655
+msgid "Not installing key"
+msgstr "Ne instaliram kljuÄ"
+
+#: ../yum/__init__.py:2661
+#, python-format
+msgid "Key import failed (code %d)"
+msgstr "Nije uspeo uvoz kljuÄa (kod %d)"
+
+#: ../yum/__init__.py:2664
+msgid "Key imported successfully"
+msgstr "KljuÄ je uspeÅ¡no uvezen"
+
+#: ../yum/__init__.py:2669
+#, python-format
+msgid ""
+"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."
+msgstr ""
+"GPG kljuÄevi izlistani za „%s“ repozitorijum su već istalirani ali nisu "
+"odgovarajući zaovaj paket.\n"
+"Proverite da li su podeÅ¡eni odgovarajući URL-ovi kljuÄeva za ovu riznicu."
+
+#: ../yum/__init__.py:2678
+msgid "Import of key(s) didn't help, wrong key(s)?"
+msgstr "Uvoz kljuÄa(kljuÄeva) nije pomogao, pogreÅ¡an kljuÄ(kljuÄevi)?"
+
+#: ../yum/__init__.py:2752
+msgid "Unable to find a suitable mirror."
+msgstr "Ne mogu da pronađem odgovarajući odraz."
+
+#: ../yum/__init__.py:2754
+msgid "Errors were encountered while downloading packages."
+msgstr "Pojavile su se greške za vreme preuzimanja paketa."
+
+#: ../yum/__init__.py:2819
+msgid "Test Transaction Errors: "
+msgstr "Greške pri proveri prenosa: "
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:197
+msgid "Loaded plugins: "
+msgstr "UÄitani dodaci: "
+
+#: ../yum/plugins.py:208
+#, python-format
+msgid "No plugin match for: %s"
+msgstr "Ne postoji slaganje za dodatak: %s"
+
+#: ../yum/plugins.py:221
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr "„%s“ dodatak je iskljuÄen"
+
+#: ../yum/plugins.py:233
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr "Dodatak „%s“ ne odrećuje verziju zahtevanog API-a"
+
+#: ../yum/plugins.py:237
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr "Dodatak „%s“ zahteva API %s. Podržani API je %s."
+
+#: ../yum/plugins.py:266
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr "UÄitavam „%s“ dodatak"
+
+#: ../yum/plugins.py:273
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom "
+"„%s“"
+
+#: ../yum/plugins.py:293
+#, python-format
+msgid "Configuration file %s not found"
+msgstr "Datoteka podešavanja %s nije pronađena"
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:296
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr "Ne mogu da pronađem datoteku podešavanja za dodatak %s"
+
+#: ../yum/plugins.py:450
+msgid "registration of commands not supported"
+msgstr "registracija komandi nije podržana"
+
+#: ../yum/rpmtrans.py:78
+msgid "Repackaging"
+msgstr "Ponovno pakovanje"
+
+#: ../rpmUtils/oldUtils.py:26
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
+msgstr "Zaglavlje se ne može otvoriti ili ne odgovara %s, %s."
+
+#: ../rpmUtils/oldUtils.py:46
+#, python-format
+msgid "RPM %s fails md5 check"
+msgstr "Nije uspela md5 provera za %s RPM"
+
+#: ../rpmUtils/oldUtils.py:144
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+msgstr ""
+"Ne mogu da za potrebe Äitanja otvorim RPM bazu podataka. Možda je već u "
+"upotrebi?"
+
+#: ../rpmUtils/oldUtils.py:174
+msgid "Got an empty Header, something has gone wrong"
+msgstr "Dobio sam prazno zaglavlje, nešto je pošlo naopako"
+
+#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
+#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#, python-format
+msgid "Damaged Header %s"
+msgstr "Oštećeno zaglavlje %s"
+
+#: ../rpmUtils/oldUtils.py:272
+#, python-format
+msgid "Error opening rpm %s - error %s"
+msgstr "Greška pri otvaranju rpm-a %s - greška %s"
diff --git a/yum/misc.py b/yum/misc.py
index 44f85d4..e1b9d4a 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -20,11 +20,22 @@ import gpgme
from Errors import MiscError
-_share_data_store = {}
+_share_data_store = {}
+_share_data_store_u = {}
def share_data(value):
""" Take a value and use the same value from the store,
if the value isn't in the store this one becomes the shared version. """
- return _share_data_store.setdefault(value, value)
+ # We don't want to change the types of strings, between str <=> unicode
+ # and hash('a') == hash(u'a') ... so use different stores.
+ # In theory eventaully we'll have all of one type, but don't hold breath.
+ store = _share_data_store
+ if isinstance(value, unicode):
+ store = _share_data_store_u
+ return store.setdefault(value, value)
+
+def unshare_data():
+ _share_data_store = {}
+ _share_data_store_u = {}
_re_compiled_glob_match = None
def re_glob(s):
@@ -522,4 +533,10 @@ def to_unicode(obj, encoding='utf-8'):
obj = unicode(obj, encoding)
return obj
+def to_str(obj):
+ """ Convert something to a string, if it isn't one. """
+ if not isinstance(obj, basestring):
+ obj = str(obj)
+ return obj
+
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index c6bcbc0..dc4057c 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -123,7 +123,7 @@ class RPMDBPackageSack(PackageSackBase):
self._simple_pkgtup_list = []
self._get_pro_cache = {}
self._get_req_cache = {}
- misc._share_data_store = {}
+ misc.unshare_data()
self._cache = {
'provides' : { },
'requires' : { },
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index be34cdc..dfc5932 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -295,7 +295,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
'provides' : { },
'requires' : { },
}
- misc._share_data_store = {}
+ misc.unshare_data()
@catchSqliteException
def close(self):
Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- yum.spec 8 Apr 2008 04:33:46 -0000 1.204
+++ yum.spec 9 Apr 2008 14:34:22 -0000 1.205
@@ -3,7 +3,7 @@
Summary: RPM installer/updater
Name: yum
Version: 3.2.14
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
Patch1: yum-mirror-priority.patch
Patch2: yum-manpage-files.patch
Patch3: yum-multilib-policy-best.patch
+Patch4: yum-big-head.patch
URL: http://linux.duke.edu/yum/
BuildArch: noarch
@@ -55,6 +56,7 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%patch4 -p1
%build
make
@@ -103,6 +105,9 @@
%dir /usr/lib/yum-plugins
%changelog
+* Wed Apr 9 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-3
+- apply patch to bring this up to where HEAD is now.
+
* Tue Apr 8 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-1
- remove committed patch
- obsoletes yum-basearchonly
--- yum-3.2.5-close.patch DELETED ---
--- yum-3.2.8-livecd-work.patch DELETED ---
--- yum-comps-write.patch DELETED ---
--- yum-mutual-obsoletes-providers.patch DELETED ---
--- yum-showasdep.patch DELETED ---
--- yum-trans-display-object.patch DELETED ---
--- yum-tsts.patch DELETED ---
More information about the fedora-extras-commits
mailing list