[yum-commits] Branch 'yum-3_2_X' - 2 commits - po/yum.pot yum/__init__.py
skvidal at osuosl.org
skvidal at osuosl.org
Thu Feb 11 18:05:44 UTC 2010
po/yum.pot | 195 ++++++++++++++++++++++++++++----------------------------
yum/__init__.py | 3
2 files changed, 100 insertions(+), 98 deletions(-)
New commits:
commit 61609af516bae2e8eea18ab618df104fce8f16cc
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Thu Feb 11 13:05:39 2010 -0500
don't translate it twice (whoops)
diff --git a/yum/__init__.py b/yum/__init__.py
index b800ad6..096268e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1467,7 +1467,7 @@ class YumBase(depsolve.Depsolve):
os.unlink(fo)
if raiseError:
- msg = _(_('Package does not match intended download. Suggestion: run yum clean metadata'))
+ msg = _('Package does not match intended download. Suggestion: run yum clean metadata')
raise URLGrabError(-1, msg)
else:
return False
commit 532335518a7e47d22c30a1588d08d7a4ce94b441
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Thu Feb 11 10:55:05 2010 -0500
If we hit the 'package does not match intended download error then
chances are REALLY good that you have outdated metadata on
gpg-re-signed pkgs. A yum clean metadata will fix things - so say that
diff --git a/po/yum.pot b/po/yum.pot
index 5f017d9..f9a1d35 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 10:43-0500\n"
+"POT-Creation-Date: 2010-02-11 10:54-0500\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"
@@ -153,15 +153,15 @@ msgstr ""
msgid "Error Downloading Packages:\n"
msgstr ""
-#: ../cli.py:426 ../yum/__init__.py:4194
+#: ../cli.py:426 ../yum/__init__.py:4195
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:435 ../yum/__init__.py:4203
+#: ../cli.py:435 ../yum/__init__.py:4204
msgid "ERROR You need to update rpm to handle:"
msgstr ""
-#: ../cli.py:437 ../yum/__init__.py:4206
+#: ../cli.py:437 ../yum/__init__.py:4207
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
@@ -329,7 +329,7 @@ msgstr ""
msgid "Done"
msgstr ""
-#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787
+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2788
#, python-format
msgid "Warning: Group %s does not exist."
msgstr ""
@@ -343,7 +343,7 @@ msgstr ""
msgid "%d Package(s) to Install"
msgstr ""
-#: ../cli.py:1028 ../yum/__init__.py:2799
+#: ../cli.py:1028 ../yum/__init__.py:2800
#, python-format
msgid "No group named %s exists"
msgstr ""
@@ -2097,28 +2097,29 @@ msgid "Could not create lock at %s: %s "
msgstr ""
#: ../yum/__init__.py:1470
-msgid "Package does not match intended download"
+msgid ""
+"Package does not match intended download. Suggestion: run yum clean metadata"
msgstr ""
-#: ../yum/__init__.py:1485
+#: ../yum/__init__.py:1486
msgid "Could not perform checksum"
msgstr ""
-#: ../yum/__init__.py:1488
+#: ../yum/__init__.py:1489
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1530
+#: ../yum/__init__.py:1531
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1533 ../yum/__init__.py:1562
+#: ../yum/__init__.py:1534 ../yum/__init__.py:1563
#, python-format
msgid "using local copy of %s"
msgstr ""
-#: ../yum/__init__.py:1574
+#: ../yum/__init__.py:1575
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2126,357 +2127,357 @@ msgid ""
" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1623
+#: ../yum/__init__.py:1624
msgid "Header is not complete."
msgstr ""
-#: ../yum/__init__.py:1660
+#: ../yum/__init__.py:1661
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1715
+#: ../yum/__init__.py:1716
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1719
+#: ../yum/__init__.py:1720
#, python-format
msgid "Problem opening package %s"
msgstr ""
-#: ../yum/__init__.py:1727
+#: ../yum/__init__.py:1728
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1731
+#: ../yum/__init__.py:1732
#, python-format
msgid "Package %s is not signed"
msgstr ""
-#: ../yum/__init__.py:1769
+#: ../yum/__init__.py:1770
#, python-format
msgid "Cannot remove %s"
msgstr ""
-#: ../yum/__init__.py:1773
+#: ../yum/__init__.py:1774
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1819
+#: ../yum/__init__.py:1820
#, python-format
msgid "Cannot remove %s file %s"
msgstr ""
-#: ../yum/__init__.py:1823
+#: ../yum/__init__.py:1824
#, python-format
msgid "%s file %s removed"
msgstr ""
-#: ../yum/__init__.py:1825
+#: ../yum/__init__.py:1826
#, python-format
msgid "%d %s files removed"
msgstr ""
-#: ../yum/__init__.py:1894
+#: ../yum/__init__.py:1895
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1900
+#: ../yum/__init__.py:1901
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:2179
+#: ../yum/__init__.py:2180
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:2218
+#: ../yum/__init__.py:2219
#, python-format
msgid "Searching %d packages"
msgstr ""
-#: ../yum/__init__.py:2222
+#: ../yum/__init__.py:2223
#, python-format
msgid "searching package %s"
msgstr ""
-#: ../yum/__init__.py:2234
+#: ../yum/__init__.py:2235
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:2241
+#: ../yum/__init__.py:2242
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:2274
+#: ../yum/__init__.py:2275
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: ../yum/__init__.py:2323
+#: ../yum/__init__.py:2324
msgid "No group data available for configured repositories"
msgstr ""
-#: ../yum/__init__.py:2354 ../yum/__init__.py:2373 ../yum/__init__.py:2404
-#: ../yum/__init__.py:2410 ../yum/__init__.py:2492 ../yum/__init__.py:2496
-#: ../yum/__init__.py:2813
+#: ../yum/__init__.py:2355 ../yum/__init__.py:2374 ../yum/__init__.py:2405
+#: ../yum/__init__.py:2411 ../yum/__init__.py:2493 ../yum/__init__.py:2497
+#: ../yum/__init__.py:2814
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:2385 ../yum/__init__.py:2512
+#: ../yum/__init__.py:2386 ../yum/__init__.py:2513
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:2432
+#: ../yum/__init__.py:2433
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:2437
#, python-format
msgid "No package named %s available to be installed"
msgstr ""
-#: ../yum/__init__.py:2538
+#: ../yum/__init__.py:2539
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:2557
+#: ../yum/__init__.py:2558
#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:2613 ../yum/__init__.py:2663
+#: ../yum/__init__.py:2614 ../yum/__init__.py:2664
msgid "Invalid version flag"
msgstr ""
-#: ../yum/__init__.py:2633 ../yum/__init__.py:2638
+#: ../yum/__init__.py:2634 ../yum/__init__.py:2639
#, python-format
msgid "No Package found for %s"
msgstr ""
-#: ../yum/__init__.py:2854
+#: ../yum/__init__.py:2855
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2858
+#: ../yum/__init__.py:2859
msgid "Nothing specified to install"
msgstr ""
-#: ../yum/__init__.py:2874 ../yum/__init__.py:3651
+#: ../yum/__init__.py:2875 ../yum/__init__.py:3652
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364
-#: ../yum/__init__.py:3657
+#: ../yum/__init__.py:2881 ../yum/__init__.py:3197 ../yum/__init__.py:3365
+#: ../yum/__init__.py:3658
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#: ../yum/__init__.py:2956
+#: ../yum/__init__.py:2957
#, python-format
msgid "Package %s installed and not available"
msgstr ""
-#: ../yum/__init__.py:2959
+#: ../yum/__init__.py:2960
msgid "No package(s) available to install"
msgstr ""
-#: ../yum/__init__.py:2971
+#: ../yum/__init__.py:2972
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2997
+#: ../yum/__init__.py:2998
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr ""
-#: ../yum/__init__.py:3000
+#: ../yum/__init__.py:3001
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr ""
-#: ../yum/__init__.py:3008
+#: ../yum/__init__.py:3009
#, python-format
msgid "Package %s already installed and latest version"
msgstr ""
-#: ../yum/__init__.py:3022
+#: ../yum/__init__.py:3023
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
#. update everything (the easy case)
-#: ../yum/__init__.py:3125
+#: ../yum/__init__.py:3126
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288
-#: ../yum/__init__.py:3314
+#: ../yum/__init__.py:3147 ../yum/__init__.py:3262 ../yum/__init__.py:3289
+#: ../yum/__init__.py:3315
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3181 ../yum/__init__.py:3361
+#: ../yum/__init__.py:3182 ../yum/__init__.py:3362
#, python-format
msgid "%s"
msgstr ""
-#: ../yum/__init__.py:3252
+#: ../yum/__init__.py:3253
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3283
+#: ../yum/__init__.py:3284
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr ""
-#: ../yum/__init__.py:3292 ../yum/__init__.py:3318
+#: ../yum/__init__.py:3293 ../yum/__init__.py:3319
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3377
+#: ../yum/__init__.py:3378
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:3411
+#: ../yum/__init__.py:3412
#, python-format
msgid "Cannot open: %s. Skipping."
msgstr ""
-#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597
+#: ../yum/__init__.py:3415 ../yum/__init__.py:3514 ../yum/__init__.py:3598
#, python-format
msgid "Examining %s: %s"
msgstr ""
-#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600
+#: ../yum/__init__.py:3423 ../yum/__init__.py:3517 ../yum/__init__.py:3601
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
-#: ../yum/__init__.py:3430
+#: ../yum/__init__.py:3431
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605
+#: ../yum/__init__.py:3460 ../yum/__init__.py:3522 ../yum/__init__.py:3606
#, python-format
msgid "Excluding %s"
msgstr ""
-#: ../yum/__init__.py:3464
+#: ../yum/__init__.py:3465
#, python-format
msgid "Marking %s to be installed"
msgstr ""
-#: ../yum/__init__.py:3470
+#: ../yum/__init__.py:3471
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:3477
+#: ../yum/__init__.py:3478
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:3510 ../yum/__init__.py:3594
+#: ../yum/__init__.py:3511 ../yum/__init__.py:3595
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr ""
-#: ../yum/__init__.py:3540
+#: ../yum/__init__.py:3541
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:3553 ../yum/__init__.py:3685
+#: ../yum/__init__.py:3554 ../yum/__init__.py:3686
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr ""
-#: ../yum/__init__.py:3574
+#: ../yum/__init__.py:3575
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
-#: ../yum/__init__.py:3677
+#: ../yum/__init__.py:3678
msgid "No package(s) available to downgrade"
msgstr ""
-#: ../yum/__init__.py:3730
+#: ../yum/__init__.py:3731
#, python-format
msgid "No Match for available package: %s"
msgstr ""
-#: ../yum/__init__.py:3737
+#: ../yum/__init__.py:3738
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr ""
-#: ../yum/__init__.py:3807 ../yum/__init__.py:3844
+#: ../yum/__init__.py:3808 ../yum/__init__.py:3845
#, python-format
msgid "Failed to downgrade: %s"
msgstr ""
-#: ../yum/__init__.py:3876
+#: ../yum/__init__.py:3877
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:3896
+#: ../yum/__init__.py:3897
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:3902
+#: ../yum/__init__.py:3903
#, python-format
msgid "Invalid GPG Key from %s: %s"
msgstr ""
-#: ../yum/__init__.py:3911
+#: ../yum/__init__.py:3912
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:3943
+#: ../yum/__init__.py:3944
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3948 ../yum/__init__.py:4010
+#: ../yum/__init__.py:3949 ../yum/__init__.py:4011
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:3965
+#: ../yum/__init__.py:3966
msgid "Not installing key"
msgstr ""
-#: ../yum/__init__.py:3971
+#: ../yum/__init__.py:3972
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:3972 ../yum/__init__.py:4031
+#: ../yum/__init__.py:3973 ../yum/__init__.py:4032
msgid "Key imported successfully"
msgstr ""
-#: ../yum/__init__.py:3977 ../yum/__init__.py:4036
+#: ../yum/__init__.py:3978 ../yum/__init__.py:4037
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2484,42 +2485,42 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:3986
+#: ../yum/__init__.py:3987
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:4005
+#: ../yum/__init__.py:4006
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr ""
-#: ../yum/__init__.py:4025
+#: ../yum/__init__.py:4026
#, python-format
msgid "Not installing key for repo %s"
msgstr ""
-#: ../yum/__init__.py:4030
+#: ../yum/__init__.py:4031
msgid "Key import failed"
msgstr ""
-#: ../yum/__init__.py:4156
+#: ../yum/__init__.py:4157
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:4158
+#: ../yum/__init__.py:4159
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:4208
+#: ../yum/__init__.py:4209
#, python-format
msgid "Please report this error at %s"
msgstr ""
-#: ../yum/__init__.py:4232
+#: ../yum/__init__.py:4233
msgid "Test Transaction Errors: "
msgstr ""
-#: ../yum/__init__.py:4333
+#: ../yum/__init__.py:4334
#, python-format
msgid "Could not set cachedir: %s"
msgstr ""
diff --git a/yum/__init__.py b/yum/__init__.py
index df952a8..b800ad6 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1467,7 +1467,8 @@ class YumBase(depsolve.Depsolve):
os.unlink(fo)
if raiseError:
- raise URLGrabError(-1, _('Package does not match intended download'))
+ msg = _(_('Package does not match intended download. Suggestion: run yum clean metadata'))
+ raise URLGrabError(-1, msg)
else:
return False
More information about the Yum-commits
mailing list