[yum-commits] Branch 'yum-3_2_X' - 3 commits - po/yum.pot utils.py yum/history.py yum/pkgtag_db.py yum/sqlitesack.py yum/sqlutils.py
skvidal at osuosl.org
skvidal at osuosl.org
Wed Feb 10 16:40:48 UTC 2010
po/yum.pot | 1290 ++++++++++++++++++++++++++++++------------------------
utils.py | 2
yum/history.py | 28 -
yum/pkgtag_db.py | 12
yum/sqlitesack.py | 38 -
yum/sqlutils.py | 24 +
6 files changed, 778 insertions(+), 616 deletions(-)
New commits:
commit a1c4dcb11b6be8ff84ad5a853755e76a8f8a26d9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Wed Feb 10 11:40:48 2010 -0500
put back comment about horrible cutting and pasting
diff --git a/yum/history.py b/yum/history.py
index e9ea94a..2707cac 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -55,6 +55,7 @@ _sttxt2stcode = {'Update' : TS_UPDATE,
'Obsoleted' : TS_OBSOLETED,
'Obsoleting' : TS_OBSOLETING}
+# ---- horrible Copy and paste from sqlitesack ----
def _setupHistorySearchSQL(patterns=None, ignore_case=False):
"""Setup need_full and patterns for _yieldSQLDataList, also see if
commit ca5474163835a9364ff805eedb030c94253be76e
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Wed Feb 10 10:43:14 2010 -0500
spell uninterruptible properly - and remaky pot file.
- yum ticket 279
diff --git a/po/yum.pot b/po/yum.pot
index eaeb80c..5f017d9 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: 2009-10-15 15:45+0200\n"
+"POT-Creation-Date: 2010-02-10 10:43-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"
@@ -16,33 +16,34 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:947 ../yum/rpmtrans.py:72
msgid "Updating"
msgstr ""
-#: ../callback.py:49 ../yum/rpmtrans.py:72
+#: ../callback.py:49 ../yum/rpmtrans.py:73
msgid "Erasing"
msgstr ""
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
-#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:946
+#: ../output.py:1659 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:75
+#: ../yum/rpmtrans.py:77
msgid "Installing"
msgstr ""
-#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58 ../output.py:1484 ../yum/rpmtrans.py:76
msgid "Obsoleted"
msgstr ""
-#: ../callback.py:54 ../output.py:1063 ../output.py:1403
+#: ../callback.py:54 ../output.py:1070 ../output.py:1442 ../output.py:1491
msgid "Updated"
msgstr ""
-#: ../callback.py:55 ../output.py:1399
+#: ../callback.py:55 ../output.py:1438
msgid "Erased"
msgstr ""
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
-#: ../output.py:1395
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1068
+#: ../output.py:1434 ../output.py:1646
msgid "Installed"
msgstr ""
@@ -64,314 +65,324 @@ msgstr ""
msgid "Erased: %s"
msgstr ""
-#: ../callback.py:217 ../output.py:941
+#: ../callback.py:217 ../output.py:948 ../output.py:1648
msgid "Removing"
msgstr ""
-#: ../callback.py:219 ../yum/rpmtrans.py:77
+#: ../callback.py:219 ../yum/rpmtrans.py:78
msgid "Cleanup"
msgstr ""
-#: ../cli.py:106
+#: ../cli.py:107
#, python-format
msgid "Command \"%s\" already defined"
msgstr ""
-#: ../cli.py:118
+#: ../cli.py:119
msgid "Setting up repositories"
msgstr ""
-#: ../cli.py:129
+#: ../cli.py:130
msgid "Reading repository metadata in from local files"
msgstr ""
-#: ../cli.py:192 ../utils.py:107
+#: ../cli.py:194 ../utils.py:193
#, python-format
msgid "Config Error: %s"
msgstr ""
-#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
+#: ../cli.py:197 ../cli.py:1272 ../utils.py:196
#, python-format
msgid "Options Error: %s"
msgstr ""
-#: ../cli.py:223
+#: ../cli.py:227
#, python-format
msgid " Installed: %s-%s at %s"
msgstr ""
-#: ../cli.py:225
+#: ../cli.py:229
#, python-format
msgid " Built : %s at %s"
msgstr ""
-#: ../cli.py:227
+#: ../cli.py:231
#, python-format
msgid " Committed: %s at %s"
msgstr ""
-#: ../cli.py:266
+#: ../cli.py:270
msgid "You need to give some command"
msgstr ""
-#: ../cli.py:309
+#: ../cli.py:284
+#, python-format
+msgid "No such command: %s. Please use %s --help"
+msgstr ""
+
+#: ../cli.py:314
msgid "Disk Requirements:\n"
msgstr ""
-#: ../cli.py:311
+#: ../cli.py:316
#, python-format
-msgid " At least %dMB needed on the %s filesystem.\n"
+msgid " At least %dMB more space needed on the %s filesystem.\n"
msgstr ""
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:316
+#: ../cli.py:321
msgid ""
"Error Summary\n"
"-------------\n"
msgstr ""
-#: ../cli.py:359
+#: ../cli.py:364
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
-#: ../cli.py:395
+#: ../cli.py:403
msgid "Exiting on user Command"
msgstr ""
-#: ../cli.py:399
+#: ../cli.py:407
msgid "Downloading Packages:"
msgstr ""
-#: ../cli.py:404
+#: ../cli.py:412
msgid "Error Downloading Packages:\n"
msgstr ""
-#: ../cli.py:418 ../yum/__init__.py:4014
+#: ../cli.py:426 ../yum/__init__.py:4194
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:427 ../yum/__init__.py:4023
+#: ../cli.py:435 ../yum/__init__.py:4203
msgid "ERROR You need to update rpm to handle:"
msgstr ""
-#: ../cli.py:429 ../yum/__init__.py:4026
+#: ../cli.py:437 ../yum/__init__.py:4206
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: ../cli.py:435
+#: ../cli.py:443
msgid "RPM needs to be updated"
msgstr ""
-#: ../cli.py:436
+#: ../cli.py:444
#, python-format
msgid "Please report this error in %s"
msgstr ""
-#: ../cli.py:442
+#: ../cli.py:450
msgid "Running Transaction Test"
msgstr ""
-#: ../cli.py:458
-msgid "Finished Transaction Test"
-msgstr ""
-
-#: ../cli.py:460
+#: ../cli.py:466
msgid "Transaction Check Error:\n"
msgstr ""
-#: ../cli.py:467
+#: ../cli.py:473
msgid "Transaction Test Succeeded"
msgstr ""
-#: ../cli.py:489
+#: ../cli.py:495
msgid "Running Transaction"
msgstr ""
-#: ../cli.py:519
+#: ../cli.py:525
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: ../cli.py:538 ../cli.py:572
+#: ../cli.py:544 ../cli.py:578
msgid " * Maybe you meant: "
msgstr ""
-#: ../cli.py:555 ../cli.py:563
+#: ../cli.py:561 ../cli.py:569
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr ""
-#: ../cli.py:569 ../cli.py:600 ../cli.py:678
+#: ../cli.py:575 ../cli.py:607 ../cli.py:687
#, python-format
msgid "No package %s%s%s available."
msgstr ""
-#: ../cli.py:605 ../cli.py:738
+#: ../cli.py:612 ../cli.py:748
msgid "Package(s) to install"
msgstr ""
-#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
-#: ../yumcommands.py:159
+#: ../cli.py:613 ../cli.py:693 ../cli.py:727 ../cli.py:749
+#: ../yumcommands.py:160
msgid "Nothing to do"
msgstr ""
-#: ../cli.py:639
+#: ../cli.py:647
#, python-format
msgid "%d packages marked for Update"
msgstr ""
-#: ../cli.py:642
+#: ../cli.py:650
msgid "No Packages marked for Update"
msgstr ""
-#: ../cli.py:656
+#: ../cli.py:664
#, python-format
msgid "%d packages marked for removal"
msgstr ""
-#: ../cli.py:659
+#: ../cli.py:667
msgid "No Packages marked for removal"
msgstr ""
-#: ../cli.py:683
+#: ../cli.py:692
msgid "Package(s) to downgrade"
msgstr ""
-#: ../cli.py:707
+#: ../cli.py:717
#, python-format
msgid " (from %s)"
msgstr ""
-#: ../cli.py:709
+#: ../cli.py:719
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr ""
-#: ../cli.py:716
+#: ../cli.py:726
msgid "Package(s) to reinstall"
msgstr ""
-#: ../cli.py:729
+#: ../cli.py:739
msgid "No Packages Provided"
msgstr ""
-#: ../cli.py:813
+#: ../cli.py:818
+#, python-format
+msgid "Matched: %s"
+msgstr ""
+
+#: ../cli.py:825
#, python-format
msgid "Warning: No matches found for: %s"
msgstr ""
-#: ../cli.py:816
+#: ../cli.py:828
msgid "No Matches found"
msgstr ""
-#: ../cli.py:855
+#: ../cli.py:868
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-#: ../cli.py:871
+#: ../cli.py:884
#, python-format
msgid "No Package Found for %s"
msgstr ""
-#: ../cli.py:883
+#: ../cli.py:896
msgid "Cleaning up Everything"
msgstr ""
-#: ../cli.py:897
+#: ../cli.py:912
msgid "Cleaning up Headers"
msgstr ""
-#: ../cli.py:900
+#: ../cli.py:915
msgid "Cleaning up Packages"
msgstr ""
-#: ../cli.py:903
+#: ../cli.py:918
msgid "Cleaning up xml metadata"
msgstr ""
-#: ../cli.py:906
+#: ../cli.py:921
msgid "Cleaning up database cache"
msgstr ""
-#: ../cli.py:909
+#: ../cli.py:924
msgid "Cleaning up expire-cache metadata"
msgstr ""
-#: ../cli.py:912
+#: ../cli.py:927
+msgid "Cleaning up cached rpmdb data"
+msgstr ""
+
+#: ../cli.py:930
msgid "Cleaning up plugins"
msgstr ""
-#: ../cli.py:937
+#: ../cli.py:955
msgid "Installed Groups:"
msgstr ""
-#: ../cli.py:949
+#: ../cli.py:967
msgid "Available Groups:"
msgstr ""
-#: ../cli.py:959
+#: ../cli.py:977
msgid "Done"
msgstr ""
-#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
+#: ../cli.py:988 ../cli.py:1006 ../cli.py:1012 ../yum/__init__.py:2787
#, python-format
msgid "Warning: Group %s does not exist."
msgstr ""
-#: ../cli.py:998
+#: ../cli.py:1016
msgid "No packages in any requested group available to install or update"
msgstr ""
-#: ../cli.py:1000
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to Install"
msgstr ""
-#: ../cli.py:1010 ../yum/__init__.py:2641
+#: ../cli.py:1028 ../yum/__init__.py:2799
#, python-format
msgid "No group named %s exists"
msgstr ""
-#: ../cli.py:1016
+#: ../cli.py:1034
msgid "No packages to remove from groups"
msgstr ""
-#: ../cli.py:1018
+#: ../cli.py:1036
#, python-format
msgid "%d Package(s) to remove"
msgstr ""
-#: ../cli.py:1060
+#: ../cli.py:1078
#, python-format
msgid "Package %s is already installed, skipping"
msgstr ""
-#: ../cli.py:1071
+#: ../cli.py:1089
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr ""
#. we've not got any installed that match n or n+a
-#: ../cli.py:1097
+#: ../cli.py:1115
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: ../cli.py:1117
+#: ../cli.py:1135
msgid "Plugin Options"
msgstr ""
-#: ../cli.py:1125
+#: ../cli.py:1143
#, python-format
msgid "Command line error: %s"
msgstr ""
-#: ../cli.py:1138
+#: ../cli.py:1156
#, python-format
msgid ""
"\n"
@@ -379,106 +390,114 @@ msgid ""
"%s: %s option requires an argument"
msgstr ""
-#: ../cli.py:1191
+#: ../cli.py:1209
msgid "--color takes one of: auto, always, never"
msgstr ""
-#: ../cli.py:1298
+#: ../cli.py:1319
msgid "show this help message and exit"
msgstr ""
-#: ../cli.py:1302
+#: ../cli.py:1323
msgid "be tolerant of errors"
msgstr ""
-#: ../cli.py:1304
-msgid "run entirely from cache, don't update cache"
+#: ../cli.py:1326
+msgid "run entirely from system cache, don't update cache"
msgstr ""
-#: ../cli.py:1306
+#: ../cli.py:1329
msgid "config file location"
msgstr ""
-#: ../cli.py:1308
+#: ../cli.py:1332
msgid "maximum command wait time"
msgstr ""
-#: ../cli.py:1310
+#: ../cli.py:1334
msgid "debugging output level"
msgstr ""
-#: ../cli.py:1314
+#: ../cli.py:1338
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
-#: ../cli.py:1316
+#: ../cli.py:1340
msgid "error output level"
msgstr ""
-#: ../cli.py:1319
+#: ../cli.py:1343
+msgid "debugging output level for rpm"
+msgstr ""
+
+#: ../cli.py:1346
msgid "quiet operation"
msgstr ""
-#: ../cli.py:1321
+#: ../cli.py:1348
msgid "verbose operation"
msgstr ""
-#: ../cli.py:1323
+#: ../cli.py:1350
msgid "answer yes for all questions"
msgstr ""
-#: ../cli.py:1325
+#: ../cli.py:1352
msgid "show Yum version and exit"
msgstr ""
-#: ../cli.py:1326
+#: ../cli.py:1353
msgid "set install root"
msgstr ""
-#: ../cli.py:1330
+#: ../cli.py:1357
msgid "enable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1334
+#: ../cli.py:1361
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1337
+#: ../cli.py:1364
msgid "exclude package(s) by name or glob"
msgstr ""
-#: ../cli.py:1339
+#: ../cli.py:1366
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: ../cli.py:1342
+#: ../cli.py:1369
msgid "enable obsoletes processing during updates"
msgstr ""
-#: ../cli.py:1344
+#: ../cli.py:1371
msgid "disable Yum plugins"
msgstr ""
-#: ../cli.py:1346
+#: ../cli.py:1373
msgid "disable gpg signature checking"
msgstr ""
-#: ../cli.py:1348
+#: ../cli.py:1375
msgid "disable plugins by name"
msgstr ""
-#: ../cli.py:1351
+#: ../cli.py:1378
msgid "enable plugins by name"
msgstr ""
-#: ../cli.py:1354
+#: ../cli.py:1381
msgid "skip packages with depsolving problems"
msgstr ""
-#: ../cli.py:1356
+#: ../cli.py:1383
msgid "control whether color is used"
msgstr ""
+#: ../cli.py:1385
+msgid "set value of $releasever in yum config and repo files"
+msgstr ""
+
#: ../output.py:305
msgid "Jan"
msgstr ""
@@ -531,253 +550,255 @@ msgstr ""
msgid "Trying other mirror."
msgstr ""
-#: ../output.py:538
+#: ../output.py:534
#, python-format
msgid "Name : %s%s%s"
msgstr ""
-#: ../output.py:539
+#: ../output.py:535
#, python-format
msgid "Arch : %s"
msgstr ""
-#: ../output.py:541
+#: ../output.py:537
#, python-format
msgid "Epoch : %s"
msgstr ""
-#: ../output.py:542
+#: ../output.py:538
#, python-format
msgid "Version : %s"
msgstr ""
-#: ../output.py:543
+#: ../output.py:539
#, python-format
msgid "Release : %s"
msgstr ""
-#: ../output.py:544
+#: ../output.py:540
#, python-format
msgid "Size : %s"
msgstr ""
-#: ../output.py:545
+#: ../output.py:541
#, python-format
msgid "Repo : %s"
msgstr ""
-#: ../output.py:547
+#: ../output.py:543
#, python-format
msgid "From repo : %s"
msgstr ""
-#: ../output.py:549
+#: ../output.py:545
#, python-format
msgid "Committer : %s"
msgstr ""
-#: ../output.py:550
+#: ../output.py:546
#, python-format
msgid "Committime : %s"
msgstr ""
-#: ../output.py:551
+#: ../output.py:547
#, python-format
msgid "Buildtime : %s"
msgstr ""
-#: ../output.py:553
+#: ../output.py:549
#, python-format
msgid "Installtime: %s"
msgstr ""
-#: ../output.py:554
+#: ../output.py:550
msgid "Summary : "
msgstr ""
-#: ../output.py:556
+#: ../output.py:552
#, python-format
msgid "URL : %s"
msgstr ""
-#: ../output.py:557
-#, python-format
-msgid "License : %s"
+#: ../output.py:553
+msgid "License : "
msgstr ""
-#: ../output.py:558
+#: ../output.py:554
msgid "Description: "
msgstr ""
-#: ../output.py:626
+#: ../output.py:622
msgid "y"
msgstr ""
-#: ../output.py:626
+#: ../output.py:622
msgid "yes"
msgstr ""
-#: ../output.py:627
+#: ../output.py:623
msgid "n"
msgstr ""
-#: ../output.py:627
+#: ../output.py:623
msgid "no"
msgstr ""
-#: ../output.py:631
+#: ../output.py:627
msgid "Is this ok [y/N]: "
msgstr ""
-#: ../output.py:722
+#: ../output.py:715
#, python-format
msgid ""
"\n"
"Group: %s"
msgstr ""
-#: ../output.py:726
+#: ../output.py:719
#, python-format
msgid " Group-Id: %s"
msgstr ""
-#: ../output.py:731
+#: ../output.py:724
#, python-format
msgid " Description: %s"
msgstr ""
-#: ../output.py:733
+#: ../output.py:726
msgid " Mandatory Packages:"
msgstr ""
-#: ../output.py:734
+#: ../output.py:727
msgid " Default Packages:"
msgstr ""
-#: ../output.py:735
+#: ../output.py:728
msgid " Optional Packages:"
msgstr ""
-#: ../output.py:736
+#: ../output.py:729
msgid " Conditional Packages:"
msgstr ""
-#: ../output.py:756
+#: ../output.py:749
#, python-format
msgid "package: %s"
msgstr ""
-#: ../output.py:758
+#: ../output.py:751
msgid " No dependencies for this package"
msgstr ""
-#: ../output.py:763
+#: ../output.py:756
#, python-format
msgid " dependency: %s"
msgstr ""
-#: ../output.py:765
+#: ../output.py:758
msgid " Unsatisfied dependency"
msgstr ""
-#: ../output.py:837
+#: ../output.py:830
#, python-format
msgid "Repo : %s"
msgstr ""
-#: ../output.py:838
+#: ../output.py:831
msgid "Matched from:"
msgstr ""
-#: ../output.py:847
+#: ../output.py:840
msgid "Description : "
msgstr ""
-#: ../output.py:850
+#: ../output.py:843
#, python-format
msgid "URL : %s"
msgstr ""
-#: ../output.py:853
+#: ../output.py:846
#, python-format
msgid "License : %s"
msgstr ""
-#: ../output.py:856
+#: ../output.py:849
#, python-format
msgid "Filename : %s"
msgstr ""
-#: ../output.py:860
+#: ../output.py:853
msgid "Other : "
msgstr ""
-#: ../output.py:893
+#: ../output.py:896
msgid "There was an error calculating total download size"
msgstr ""
-#: ../output.py:898
+#: ../output.py:901
#, python-format
msgid "Total size: %s"
msgstr ""
-#: ../output.py:901
+#: ../output.py:904
#, python-format
msgid "Total download size: %s"
msgstr ""
-#: ../output.py:942
+#: ../output.py:908
+#, python-format
+msgid "Installed size: %s"
+msgstr ""
+
+#: ../output.py:949
msgid "Reinstalling"
msgstr ""
-#: ../output.py:943
+#: ../output.py:950
msgid "Downgrading"
msgstr ""
-#: ../output.py:944
+#: ../output.py:951
msgid "Installing for dependencies"
msgstr ""
-#: ../output.py:945
+#: ../output.py:952
msgid "Updating for dependencies"
msgstr ""
-#: ../output.py:946
+#: ../output.py:953
msgid "Removing for dependencies"
msgstr ""
-#: ../output.py:953 ../output.py:1065
+#: ../output.py:960 ../output.py:1072
msgid "Skipped (dependency problems)"
msgstr ""
-#: ../output.py:976
+#: ../output.py:983
msgid "Package"
msgstr ""
-#: ../output.py:976
+#: ../output.py:983
msgid "Arch"
msgstr ""
-#: ../output.py:977
+#: ../output.py:984
msgid "Version"
msgstr ""
-#: ../output.py:977
+#: ../output.py:984
msgid "Repository"
msgstr ""
-#: ../output.py:978
+#: ../output.py:985
msgid "Size"
msgstr ""
-#: ../output.py:990
+#: ../output.py:997
#, python-format
-msgid ""
-" replacing %s%s%s.%s %s\n"
-"\n"
+msgid " replacing %s%s%s.%s %s\n"
msgstr ""
-#: ../output.py:999
+#: ../output.py:1006
#, python-format
msgid ""
"\n"
@@ -785,14 +806,14 @@ msgid ""
"%s\n"
msgstr ""
-#: ../output.py:1006
+#: ../output.py:1013
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
"Upgrade %5.5s Package(s)\n"
msgstr ""
-#: ../output.py:1015
+#: ../output.py:1022
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -800,32 +821,32 @@ msgid ""
"Downgrade %5.5s Package(s)\n"
msgstr ""
-#: ../output.py:1059
+#: ../output.py:1066
msgid "Removed"
msgstr ""
-#: ../output.py:1060
+#: ../output.py:1067
msgid "Dependency Removed"
msgstr ""
-#: ../output.py:1062
+#: ../output.py:1069
msgid "Dependency Installed"
msgstr ""
-#: ../output.py:1064
+#: ../output.py:1071
msgid "Dependency Updated"
msgstr ""
-#: ../output.py:1066
+#: ../output.py:1073
msgid "Replaced"
msgstr ""
-#: ../output.py:1067
+#: ../output.py:1074
msgid "Failed"
msgstr ""
#. Delta between C-c's so we treat as exit
-#: ../output.py:1133
+#: ../output.py:1140
msgid "two"
msgstr ""
@@ -833,7 +854,7 @@ msgstr ""
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1144
+#: ../output.py:1151
#, python-format
msgid ""
"\n"
@@ -842,221 +863,374 @@ msgid ""
"to exit.\n"
msgstr ""
-#: ../output.py:1155
+#: ../output.py:1162
msgid "user interrupt"
msgstr ""
-#: ../output.py:1173
+#: ../output.py:1180
msgid "Total"
msgstr ""
+#: ../output.py:1202
+msgid "I"
+msgstr ""
+
#: ../output.py:1203
-msgid "<unset>"
+msgid "O"
msgstr ""
#: ../output.py:1204
+msgid "E"
+msgstr ""
+
+#: ../output.py:1205
+msgid "R"
+msgstr ""
+
+#: ../output.py:1206
+msgid "D"
+msgstr ""
+
+#: ../output.py:1207
+msgid "U"
+msgstr ""
+
+#: ../output.py:1217
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1218
msgid "System"
msgstr ""
-#: ../output.py:1240
+#: ../output.py:1254
msgid "Bad transaction IDs, or package(s), given"
msgstr ""
-#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
-msgid "Warning: RPMDB has been altered since the last yum transaction."
+#: ../output.py:1266
+msgid "ID"
+msgstr ""
+
+#: ../output.py:1267 ../output.py:1520
+msgid "Login user"
msgstr ""
-#: ../output.py:1289
+#: ../output.py:1268
+msgid "Date and time"
+msgstr ""
+
+#: ../output.py:1269 ../output.py:1522
+msgid "Action(s)"
+msgstr ""
+
+#: ../output.py:1270 ../output.py:1523
+msgid "Altered"
+msgstr ""
+
+#: ../output.py:1310
msgid "No transaction ID given"
msgstr ""
-#: ../output.py:1297
+#: ../output.py:1336
msgid "Bad transaction ID given"
msgstr ""
-#: ../output.py:1302
+#: ../output.py:1341
msgid "Not found given transaction ID"
msgstr ""
-#: ../output.py:1310
+#: ../output.py:1349
msgid "Found more than one transaction ID!"
msgstr ""
-#: ../output.py:1331
+#: ../output.py:1370
msgid "No transaction ID, or package, given"
msgstr ""
-#: ../output.py:1357
+#: ../output.py:1396
msgid "Transaction ID :"
msgstr ""
-#: ../output.py:1359
+#: ../output.py:1398
msgid "Begin time :"
msgstr ""
-#: ../output.py:1362 ../output.py:1364
+#: ../output.py:1401 ../output.py:1403
msgid "Begin rpmdb :"
msgstr ""
-#: ../output.py:1378
+#: ../output.py:1417
#, python-format
msgid "(%s seconds)"
msgstr ""
-#: ../output.py:1379
+#: ../output.py:1418
msgid "End time :"
msgstr ""
-#: ../output.py:1382 ../output.py:1384
+#: ../output.py:1421 ../output.py:1423
msgid "End rpmdb :"
msgstr ""
-#: ../output.py:1385
+#: ../output.py:1424
msgid "User :"
msgstr ""
-#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#: ../output.py:1426 ../output.py:1428 ../output.py:1430
msgid "Return-Code :"
msgstr ""
-#: ../output.py:1387
+#: ../output.py:1426
msgid "Aborted"
msgstr ""
-#: ../output.py:1389
+#: ../output.py:1428
msgid "Failure:"
msgstr ""
-#: ../output.py:1391
+#: ../output.py:1430
msgid "Success"
msgstr ""
-#: ../output.py:1392
+#: ../output.py:1431
msgid "Transaction performed with:"
msgstr ""
-#: ../output.py:1405
+#: ../output.py:1444 ../output.py:1489
msgid "Downgraded"
msgstr ""
#. multiple versions installed, both older and newer
-#: ../output.py:1407
+#: ../output.py:1446
msgid "Weird"
msgstr ""
-#: ../output.py:1409
+#: ../output.py:1448
msgid "Packages Altered:"
msgstr ""
-#: ../output.py:1412
+#: ../output.py:1451
msgid "Scriptlet output:"
msgstr ""
-#: ../output.py:1418
+#: ../output.py:1457
msgid "Errors:"
msgstr ""
-#: ../output.py:1489
-msgid "Last day"
+#: ../output.py:1481 ../output.py:1482
+msgid "Install"
+msgstr ""
+
+#: ../output.py:1483
+msgid "Dep-Install"
+msgstr ""
+
+#: ../output.py:1485
+msgid "Obsoleting"
+msgstr ""
+
+#: ../output.py:1486
+msgid "Erase"
+msgstr ""
+
+#: ../output.py:1487
+msgid "Reinstall"
+msgstr ""
+
+#: ../output.py:1488
+msgid "Downgrade"
msgstr ""
#: ../output.py:1490
+msgid "Update"
+msgstr ""
+
+#: ../output.py:1521
+msgid "Time"
+msgstr ""
+
+#: ../output.py:1547
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1548
msgid "Last week"
msgstr ""
-#: ../output.py:1491
+#: ../output.py:1549
msgid "Last 2 weeks"
msgstr ""
#. US default :p
-#: ../output.py:1492
+#: ../output.py:1550
msgid "Last 3 months"
msgstr ""
-#: ../output.py:1493
+#: ../output.py:1551
msgid "Last 6 months"
msgstr ""
-#: ../output.py:1494
+#: ../output.py:1552
msgid "Last year"
msgstr ""
-#: ../output.py:1495
+#: ../output.py:1553
msgid "Over a year ago"
msgstr ""
-#: ../output.py:1524
+#: ../output.py:1585
msgid "installed"
msgstr ""
-#: ../output.py:1525
+#: ../output.py:1586
msgid "updated"
msgstr ""
-#: ../output.py:1526
+#: ../output.py:1587
msgid "obsoleted"
msgstr ""
-#: ../output.py:1527
+#: ../output.py:1588
msgid "erased"
msgstr ""
-#: ../output.py:1531
+#: ../output.py:1592
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr ""
-#: ../output.py:1538
+#: ../output.py:1599
msgid "--> Running transaction check"
msgstr ""
-#: ../output.py:1543
+#: ../output.py:1604
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
-#: ../output.py:1548
+#: ../output.py:1609
msgid "--> Finished Dependency Resolution"
msgstr ""
-#: ../output.py:1553 ../output.py:1558
+#: ../output.py:1614 ../output.py:1619
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr ""
-#: ../output.py:1562
+#: ../output.py:1623
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr ""
-#: ../output.py:1568 ../output.py:1573
+#: ../output.py:1634
+#, python-format
+msgid "Package: %s"
+msgstr ""
+
+#: ../output.py:1636
+#, python-format
+msgid ""
+"\n"
+" Requires: %s"
+msgstr ""
+
+#: ../output.py:1649 ../output.py:1660
+#, python-format
+msgid ""
+"\n"
+" %s: %s (%s)"
+msgstr ""
+
+#: ../output.py:1657
+msgid "Available"
+msgstr ""
+
+#: ../output.py:1665 ../output.py:1670
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr ""
-#: ../output.py:1577
+#: ../output.py:1674
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: ../output.py:1581
+#: ../output.py:1678
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
-#: ../utils.py:137 ../yummain.py:42
+#: ../utils.py:93
+msgid "Running"
+msgstr ""
+
+#: ../utils.py:94
+msgid "Sleeping"
+msgstr ""
+
+#: ../utils.py:95
+msgid "Uninterruptible"
+msgstr ""
+
+#: ../utils.py:96
+msgid "Zombie"
+msgstr ""
+
+#: ../utils.py:97
+msgid "Traced/Stopped"
+msgstr ""
+
+#: ../utils.py:98 ../yumcommands.py:917
+msgid "Unknown"
+msgstr ""
+
+#: ../utils.py:109
+msgid " The other application is: PackageKit"
+msgstr ""
+
+#: ../utils.py:111
+#, python-format
+msgid " The other application is: %s"
+msgstr ""
+
+#: ../utils.py:114
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr ""
+
+#: ../utils.py:119
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr ""
+
+#: ../utils.py:121
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr ""
+
+#: ../utils.py:199
+#, python-format
+msgid "PluginExit Error: %s"
+msgstr ""
+
+#: ../utils.py:202
+#, python-format
+msgid "Yum Error: %s"
+msgstr ""
+
+#: ../utils.py:235 ../yummain.py:42
msgid ""
"\n"
"\n"
"Exiting on user cancel"
msgstr ""
-#: ../utils.py:143 ../yummain.py:48
+#: ../utils.py:241 ../yummain.py:48
msgid ""
"\n"
"\n"
"Exiting on Broken Pipe"
msgstr ""
-#: ../utils.py:145 ../yummain.py:50
+#: ../utils.py:243 ../yummain.py:50
#, python-format
msgid ""
"\n"
@@ -1064,15 +1238,15 @@ msgid ""
"%s"
msgstr ""
-#: ../utils.py:184 ../yummain.py:273
+#: ../utils.py:282 ../yummain.py:211
msgid "Complete!"
msgstr ""
-#: ../yumcommands.py:42
+#: ../yumcommands.py:43
msgid "You need to be root to perform this command."
msgstr ""
-#: ../yumcommands.py:49
+#: ../yumcommands.py:50
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -1090,487 +1264,444 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: ../yumcommands.py:69
+#: ../yumcommands.py:70
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr ""
-#: ../yumcommands.py:75
+#: ../yumcommands.py:76
msgid "Error: Need an item to match"
msgstr ""
-#: ../yumcommands.py:81
+#: ../yumcommands.py:82
msgid "Error: Need a group or list of groups"
msgstr ""
-#: ../yumcommands.py:90
+#: ../yumcommands.py:91
#, python-format
msgid "Error: clean requires an option: %s"
msgstr ""
-#: ../yumcommands.py:95
+#: ../yumcommands.py:96
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr ""
-#: ../yumcommands.py:108
+#: ../yumcommands.py:109
msgid "No argument to shell"
msgstr ""
-#: ../yumcommands.py:110
+#: ../yumcommands.py:111
#, python-format
msgid "Filename passed to shell: %s"
msgstr ""
-#: ../yumcommands.py:114
+#: ../yumcommands.py:115
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
-#: ../yumcommands.py:120
+#: ../yumcommands.py:121
msgid "Error: more than one file given as argument to shell."
msgstr ""
-#: ../yumcommands.py:169
+#: ../yumcommands.py:170
msgid "PACKAGE..."
msgstr ""
-#: ../yumcommands.py:172
+#: ../yumcommands.py:173
msgid "Install a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:180
+#: ../yumcommands.py:181
msgid "Setting up Install Process"
msgstr ""
-#: ../yumcommands.py:191
+#: ../yumcommands.py:192
msgid "[PACKAGE...]"
msgstr ""
-#: ../yumcommands.py:194
+#: ../yumcommands.py:195
msgid "Update a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:201
+#: ../yumcommands.py:202
msgid "Setting up Update Process"
msgstr ""
-#: ../yumcommands.py:246
+#: ../yumcommands.py:244
msgid "Display details about a package or group of packages"
msgstr ""
-#: ../yumcommands.py:295
+#: ../yumcommands.py:293
msgid "Installed Packages"
msgstr ""
-#: ../yumcommands.py:303
+#: ../yumcommands.py:301
msgid "Available Packages"
msgstr ""
-#: ../yumcommands.py:307
+#: ../yumcommands.py:305
msgid "Extra Packages"
msgstr ""
-#: ../yumcommands.py:311
+#: ../yumcommands.py:309
msgid "Updated Packages"
msgstr ""
#. This only happens in verbose mode
-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
+#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:601
msgid "Obsoleting Packages"
msgstr ""
-#: ../yumcommands.py:328
+#: ../yumcommands.py:326
msgid "Recently Added Packages"
msgstr ""
-#: ../yumcommands.py:335
+#: ../yumcommands.py:333
msgid "No matching Packages to list"
msgstr ""
-#: ../yumcommands.py:349
+#: ../yumcommands.py:347
msgid "List a package or groups of packages"
msgstr ""
-#: ../yumcommands.py:361
+#: ../yumcommands.py:359
msgid "Remove a package or packages from your system"
msgstr ""
-#: ../yumcommands.py:368
+#: ../yumcommands.py:366
msgid "Setting up Remove Process"
msgstr ""
-#: ../yumcommands.py:382
+#: ../yumcommands.py:380
msgid "Setting up Group Process"
msgstr ""
-#: ../yumcommands.py:388
+#: ../yumcommands.py:386
msgid "No Groups on which to run command"
msgstr ""
-#: ../yumcommands.py:401
+#: ../yumcommands.py:399
msgid "List available package groups"
msgstr ""
-#: ../yumcommands.py:418
+#: ../yumcommands.py:416
msgid "Install the packages in a group on your system"
msgstr ""
-#: ../yumcommands.py:440
+#: ../yumcommands.py:438
msgid "Remove the packages in a group from your system"
msgstr ""
-#: ../yumcommands.py:467
+#: ../yumcommands.py:465
msgid "Display details about a package group"
msgstr ""
-#: ../yumcommands.py:491
+#: ../yumcommands.py:489
msgid "Generate the metadata cache"
msgstr ""
-#: ../yumcommands.py:497
+#: ../yumcommands.py:495
msgid "Making cache files for all metadata files."
msgstr ""
-#: ../yumcommands.py:498
+#: ../yumcommands.py:496
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: ../yumcommands.py:519
+#: ../yumcommands.py:517
msgid "Metadata Cache Created"
msgstr ""
-#: ../yumcommands.py:533
+#: ../yumcommands.py:531
msgid "Remove cached data"
msgstr ""
-#: ../yumcommands.py:553
+#: ../yumcommands.py:551
msgid "Find what package provides the given value"
msgstr ""
-#: ../yumcommands.py:573
+#: ../yumcommands.py:571
msgid "Check for available package updates"
msgstr ""
-#: ../yumcommands.py:623
+#: ../yumcommands.py:621
msgid "Search package details for the given string"
msgstr ""
-#: ../yumcommands.py:629
+#: ../yumcommands.py:627
msgid "Searching Packages: "
msgstr ""
-#: ../yumcommands.py:646
+#: ../yumcommands.py:644
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: ../yumcommands.py:654
+#: ../yumcommands.py:652
msgid "Setting up Upgrade Process"
msgstr ""
-#: ../yumcommands.py:668
+#: ../yumcommands.py:666
msgid "Install a local RPM"
msgstr ""
-#: ../yumcommands.py:676
+#: ../yumcommands.py:674
msgid "Setting up Local Package Process"
msgstr ""
-#: ../yumcommands.py:695
+#: ../yumcommands.py:693
msgid "Determine which package provides the given dependency"
msgstr ""
-#: ../yumcommands.py:698
+#: ../yumcommands.py:696
msgid "Searching Packages for Dependency:"
msgstr ""
-#: ../yumcommands.py:712
+#: ../yumcommands.py:710
msgid "Run an interactive yum shell"
msgstr ""
-#: ../yumcommands.py:718
+#: ../yumcommands.py:716
msgid "Setting up Yum Shell"
msgstr ""
-#: ../yumcommands.py:736
+#: ../yumcommands.py:734
msgid "List a package's dependencies"
msgstr ""
-#: ../yumcommands.py:742
+#: ../yumcommands.py:740
msgid "Finding dependencies: "
msgstr ""
-#: ../yumcommands.py:758
+#: ../yumcommands.py:756
msgid "Display the configured software repositories"
msgstr ""
-#: ../yumcommands.py:810 ../yumcommands.py:811
+#: ../yumcommands.py:822 ../yumcommands.py:823
msgid "enabled"
msgstr ""
-#: ../yumcommands.py:819 ../yumcommands.py:820
+#: ../yumcommands.py:849 ../yumcommands.py:850
msgid "disabled"
msgstr ""
-#: ../yumcommands.py:834
+#: ../yumcommands.py:866
msgid "Repo-id : "
msgstr ""
-#: ../yumcommands.py:835
+#: ../yumcommands.py:867
msgid "Repo-name : "
msgstr ""
-#: ../yumcommands.py:836
+#: ../yumcommands.py:870
msgid "Repo-status : "
msgstr ""
-#: ../yumcommands.py:838
+#: ../yumcommands.py:873
msgid "Repo-revision: "
msgstr ""
-#: ../yumcommands.py:842
+#: ../yumcommands.py:877
msgid "Repo-tags : "
msgstr ""
-#: ../yumcommands.py:848
+#: ../yumcommands.py:883
msgid "Repo-distro-tags: "
msgstr ""
-#: ../yumcommands.py:853
+#: ../yumcommands.py:888
msgid "Repo-updated : "
msgstr ""
-#: ../yumcommands.py:855
+#: ../yumcommands.py:890
msgid "Repo-pkgs : "
msgstr ""
-#: ../yumcommands.py:856
+#: ../yumcommands.py:891
msgid "Repo-size : "
msgstr ""
-#: ../yumcommands.py:863
+#: ../yumcommands.py:898
msgid "Repo-baseurl : "
msgstr ""
-#: ../yumcommands.py:871
+#: ../yumcommands.py:906
msgid "Repo-metalink: "
msgstr ""
-#: ../yumcommands.py:875
+#: ../yumcommands.py:910
msgid " Updated : "
msgstr ""
-#: ../yumcommands.py:878
+#: ../yumcommands.py:913
msgid "Repo-mirrors : "
msgstr ""
-#: ../yumcommands.py:882 ../yummain.py:133
-msgid "Unknown"
-msgstr ""
-
-#: ../yumcommands.py:888
+#: ../yumcommands.py:923
#, python-format
msgid "Never (last: %s)"
msgstr ""
-#: ../yumcommands.py:890
+#: ../yumcommands.py:925
#, python-format
msgid "Instant (last: %s)"
msgstr ""
-#: ../yumcommands.py:893
+#: ../yumcommands.py:928
#, python-format
msgid "%s second(s) (last: %s)"
msgstr ""
-#: ../yumcommands.py:895
+#: ../yumcommands.py:930
msgid "Repo-expire : "
msgstr ""
-#: ../yumcommands.py:898
+#: ../yumcommands.py:933
msgid "Repo-exclude : "
msgstr ""
-#: ../yumcommands.py:902
+#: ../yumcommands.py:937
msgid "Repo-include : "
msgstr ""
+#: ../yumcommands.py:941
+msgid "Repo-excluded: "
+msgstr ""
+
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:912 ../yumcommands.py:938
+#: ../yumcommands.py:951 ../yumcommands.py:980
msgid "repo id"
msgstr ""
-#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+#: ../yumcommands.py:968 ../yumcommands.py:969 ../yumcommands.py:987
msgid "status"
msgstr ""
-#: ../yumcommands.py:939
+#: ../yumcommands.py:981
msgid "repo name"
msgstr ""
-#: ../yumcommands.py:965
+#: ../yumcommands.py:1018
msgid "Display a helpful usage message"
msgstr ""
-#: ../yumcommands.py:999
+#: ../yumcommands.py:1052
#, python-format
msgid "No help available for %s"
msgstr ""
-#: ../yumcommands.py:1004
+#: ../yumcommands.py:1057
msgid ""
"\n"
"\n"
"aliases: "
msgstr ""
-#: ../yumcommands.py:1006
+#: ../yumcommands.py:1059
msgid ""
"\n"
"\n"
"alias: "
msgstr ""
-#: ../yumcommands.py:1034
+#: ../yumcommands.py:1087
msgid "Setting up Reinstall Process"
msgstr ""
-#: ../yumcommands.py:1042
+#: ../yumcommands.py:1095
msgid "reinstall a package"
msgstr ""
-#: ../yumcommands.py:1060
+#: ../yumcommands.py:1113
msgid "Setting up Downgrade Process"
msgstr ""
-#: ../yumcommands.py:1067
+#: ../yumcommands.py:1120
msgid "downgrade a package"
msgstr ""
-#: ../yumcommands.py:1081
+#: ../yumcommands.py:1134
msgid "Display a version for the machine and/or available repos."
msgstr ""
-#: ../yumcommands.py:1111
+#: ../yumcommands.py:1173
msgid " Yum version groups:"
msgstr ""
-#: ../yumcommands.py:1121
+#: ../yumcommands.py:1183
msgid " Group :"
msgstr ""
-#: ../yumcommands.py:1122
+#: ../yumcommands.py:1184
msgid " Packages:"
msgstr ""
-#: ../yumcommands.py:1152
+#: ../yumcommands.py:1213
msgid "Installed:"
msgstr ""
-#: ../yumcommands.py:1157
+#: ../yumcommands.py:1218
msgid "Group-Installed:"
msgstr ""
-#: ../yumcommands.py:1166
+#: ../yumcommands.py:1227
msgid "Available:"
msgstr ""
-#: ../yumcommands.py:1172
+#: ../yumcommands.py:1233
msgid "Group-Available:"
msgstr ""
-#: ../yumcommands.py:1211
+#: ../yumcommands.py:1272
msgid "Display, or use, the transaction history"
msgstr ""
-#: ../yumcommands.py:1239
+#: ../yumcommands.py:1300
#, python-format
msgid "Invalid history sub-command, use: %s."
msgstr ""
-#: ../yummain.py:128
-msgid "Running"
-msgstr ""
-
-#: ../yummain.py:129
-msgid "Sleeping"
-msgstr ""
-
-#: ../yummain.py:130
-msgid "Uninteruptable"
-msgstr ""
-
-#: ../yummain.py:131
-msgid "Zombie"
-msgstr ""
-
-#: ../yummain.py:132
-msgid "Traced/Stopped"
-msgstr ""
-
-#: ../yummain.py:137
-msgid " The other application is: PackageKit"
-msgstr ""
-
-#: ../yummain.py:139
-#, python-format
-msgid " The other application is: %s"
-msgstr ""
-
-#: ../yummain.py:142
-#, python-format
-msgid " Memory : %5s RSS (%5sB VSZ)"
-msgstr ""
-
-#: ../yummain.py:146
-#, python-format
-msgid " Started: %s - %s ago"
+#: ../yumcommands.py:1345
+msgid "Check for problems in the rpmdb"
msgstr ""
-#: ../yummain.py:148
-#, python-format
-msgid " State : %s, pid: %d"
-msgstr ""
-
-#: ../yummain.py:173
+#: ../yummain.py:102
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
-#: ../yummain.py:201 ../yummain.py:240
+#: ../yummain.py:130 ../yummain.py:169
#, python-format
msgid "Error: %s"
msgstr ""
-#: ../yummain.py:211 ../yummain.py:253
+#: ../yummain.py:140 ../yummain.py:182
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr ""
#. Depsolve stage
-#: ../yummain.py:218
+#: ../yummain.py:147
msgid "Resolving Dependencies"
msgstr ""
-#: ../yummain.py:242
+#: ../yummain.py:173
msgid " You could try using --skip-broken to work around the problem"
msgstr ""
-#: ../yummain.py:243
-msgid ""
-" You could try running: package-cleanup --problems\n"
-" package-cleanup --dupes\n"
-" rpm -Va --nofiles --nodigest"
+#: ../yummain.py:175 ../yummain.py:208
+msgid " You could try running: rpm -Va --nofiles --nodigest"
msgstr ""
-#: ../yummain.py:259
+#: ../yummain.py:188
msgid ""
"\n"
"Dependencies Resolved"
msgstr ""
-#: ../yummain.py:326
+#: ../yummain.py:265
msgid ""
"\n"
"\n"
@@ -1605,362 +1736,389 @@ msgstr ""
msgid "Matched %s to require for %s"
msgstr ""
-#: ../yum/depsolve.py:224
+#: ../yum/depsolve.py:225
#, python-format
msgid "Member: %s"
msgstr ""
-#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
+#: ../yum/depsolve.py:239 ../yum/depsolve.py:754
#, python-format
msgid "%s converted to install"
msgstr ""
-#: ../yum/depsolve.py:245
+#: ../yum/depsolve.py:246
#, python-format
msgid "Adding Package %s in mode %s"
msgstr ""
-#: ../yum/depsolve.py:255
+#: ../yum/depsolve.py:256
#, python-format
msgid "Removing Package %s"
msgstr ""
-#: ../yum/depsolve.py:277
+#: ../yum/depsolve.py:278
#, python-format
msgid "%s requires: %s"
msgstr ""
-#: ../yum/depsolve.py:335
+#: ../yum/depsolve.py:319
+#, python-format
+msgid "%s requires %s"
+msgstr ""
+
+#: ../yum/depsolve.py:346
msgid "Needed Require has already been looked up, cheating"
msgstr ""
-#: ../yum/depsolve.py:345
+#: ../yum/depsolve.py:356
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr ""
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:363
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:386
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr ""
-#: ../yum/depsolve.py:379
+#: ../yum/depsolve.py:390
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr ""
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:394
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: ../yum/depsolve.py:396
+#: ../yum/depsolve.py:407
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:399
+#: ../yum/depsolve.py:410
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:418
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr ""
-#: ../yum/depsolve.py:417
-#, python-format
-msgid "Unresolvable requirement %s for %s"
-msgstr ""
-
-#: ../yum/depsolve.py:440
+#: ../yum/depsolve.py:449
#, python-format
msgid "Quick matched %s to require for %s"
msgstr ""
#. is it already installed?
-#: ../yum/depsolve.py:482
+#: ../yum/depsolve.py:491
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
-#: ../yum/depsolve.py:498
+#: ../yum/depsolve.py:507
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: ../yum/depsolve.py:509
+#: ../yum/depsolve.py:518
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
-#, python-format
-msgid "Missing Dependency: %s is needed by package %s"
-msgstr ""
-
-#: ../yum/depsolve.py:530
+#: ../yum/depsolve.py:536
#, python-format
msgid "%s already in ts, skipping this one"
msgstr ""
-#: ../yum/depsolve.py:573
+#: ../yum/depsolve.py:578
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr ""
-#: ../yum/depsolve.py:581
+#: ../yum/depsolve.py:586
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr ""
-#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
+#: ../yum/depsolve.py:690 ../yum/depsolve.py:781
msgid "Success - empty transaction"
msgstr ""
-#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
+#: ../yum/depsolve.py:729 ../yum/depsolve.py:744
msgid "Restarting Loop"
msgstr ""
-#: ../yum/depsolve.py:755
+#: ../yum/depsolve.py:760
msgid "Dependency Process ending"
msgstr ""
-#: ../yum/depsolve.py:761
+#: ../yum/depsolve.py:774
#, python-format
msgid "%s from %s has depsolving problems"
msgstr ""
-#: ../yum/depsolve.py:768
+#: ../yum/depsolve.py:782
msgid "Success - deps resolved"
msgstr ""
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:796
#, python-format
msgid "Checking deps for %s"
msgstr ""
-#: ../yum/depsolve.py:865
+#: ../yum/depsolve.py:874
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr ""
-#: ../yum/depsolve.py:1007
+#: ../yum/depsolve.py:1090
#, python-format
msgid "Running compare_providers() for %s"
msgstr ""
-#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
+#: ../yum/depsolve.py:1117 ../yum/depsolve.py:1123
#, python-format
msgid "better arch in po %s"
msgstr ""
-#: ../yum/depsolve.py:1142
+#: ../yum/depsolve.py:1218
#, python-format
msgid "%s obsoletes %s"
msgstr ""
-#: ../yum/depsolve.py:1154
+#: ../yum/depsolve.py:1230
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
" Winner: %s"
msgstr ""
-#: ../yum/depsolve.py:1161
+#: ../yum/depsolve.py:1237
#, python-format
msgid "common sourcerpm %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1167
+#: ../yum/depsolve.py:1241
+#, python-format
+msgid "base package %s is installed for %s"
+msgstr ""
+
+#: ../yum/depsolve.py:1247
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1175
+#: ../yum/depsolve.py:1256
#, python-format
msgid "Best Order: %s"
msgstr ""
-#: ../yum/__init__.py:187
+#: ../yum/__init__.py:192
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:412
+#: ../yum/__init__.py:424
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr ""
-#: ../yum/__init__.py:450
+#: ../yum/__init__.py:462
msgid "plugins already initialised"
msgstr ""
-#: ../yum/__init__.py:457
+#: ../yum/__init__.py:469
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:468
+#: ../yum/__init__.py:480
msgid "Reading Local RPMDB"
msgstr ""
-#: ../yum/__init__.py:489
+#: ../yum/__init__.py:504
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:509
+#: ../yum/__init__.py:524
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:539
+#: ../yum/__init__.py:554
msgid "Setting up Package Sacks"
msgstr ""
-#: ../yum/__init__.py:584
+#: ../yum/__init__.py:599
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: ../yum/__init__.py:585
+#: ../yum/__init__.py:600
msgid "therefore this repo cannot be reset.\n"
msgstr ""
-#: ../yum/__init__.py:590
+#: ../yum/__init__.py:605
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:602
+#: ../yum/__init__.py:617
msgid "Building updates object"
msgstr ""
-#: ../yum/__init__.py:637
+#: ../yum/__init__.py:652
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:662
+#: ../yum/__init__.py:677
msgid "Getting group metadata"
msgstr ""
-#: ../yum/__init__.py:688
+#: ../yum/__init__.py:703
#, python-format
msgid "Adding group file from repository: %s"
msgstr ""
-#: ../yum/__init__.py:697
+#: ../yum/__init__.py:712
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr ""
-#: ../yum/__init__.py:703
+#: ../yum/__init__.py:718
msgid "No Groups Available in any repository"
msgstr ""
-#: ../yum/__init__.py:763
+#: ../yum/__init__.py:730
+msgid "Getting pkgtags metadata"
+msgstr ""
+
+#: ../yum/__init__.py:740
+#, python-format
+msgid "Adding tags from repository: %s"
+msgstr ""
+
+#: ../yum/__init__.py:749
+#, python-format
+msgid "Failed to add Pkg Tags for repository: %s - %s"
+msgstr ""
+
+#: ../yum/__init__.py:827
msgid "Importing additional filelist information"
msgstr ""
-#: ../yum/__init__.py:777
+#: ../yum/__init__.py:841
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr ""
-#: ../yum/__init__.py:785
+#: ../yum/__init__.py:849
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
msgstr ""
-#: ../yum/__init__.py:853
+#. Kind of hacky
+#: ../yum/__init__.py:922
#, python-format
msgid "Skip-broken round %i"
msgstr ""
-#: ../yum/__init__.py:906
+#: ../yum/__init__.py:975
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: ../yum/__init__.py:907
+#: ../yum/__init__.py:976
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
-#: ../yum/__init__.py:911
+#: ../yum/__init__.py:980
#, python-format
msgid " %s from %s"
msgstr ""
-#: ../yum/__init__.py:1083
+#: ../yum/__init__.py:1121
+msgid "Warning: RPMDB altered outside of yum."
+msgstr ""
+
+#: ../yum/__init__.py:1126
+msgid "missing requires"
+msgstr ""
+
+#: ../yum/__init__.py:1127
+msgid "installed conflict"
+msgstr ""
+
+#: ../yum/__init__.py:1180
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
-#: ../yum/__init__.py:1101
+#: ../yum/__init__.py:1198
#, python-format
msgid "Failed to remove transaction file %s"
msgstr ""
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1130
+#: ../yum/__init__.py:1227
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr ""
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1169
+#: ../yum/__init__.py:1266
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1386
#, python-format
msgid "Unable to check if PID %s is active"
msgstr ""
#. Another copy seems to be running.
-#: ../yum/__init__.py:1293
+#: ../yum/__init__.py:1390
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1328
+#: ../yum/__init__.py:1425
#, python-format
msgid "Could not create lock at %s: %s "
msgstr ""
-#: ../yum/__init__.py:1373
+#: ../yum/__init__.py:1470
msgid "Package does not match intended download"
msgstr ""
-#: ../yum/__init__.py:1388
+#: ../yum/__init__.py:1485
msgid "Could not perform checksum"
msgstr ""
-#: ../yum/__init__.py:1391
+#: ../yum/__init__.py:1488
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1433
+#: ../yum/__init__.py:1530
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
+#: ../yum/__init__.py:1533 ../yum/__init__.py:1562
#, python-format
msgid "using local copy of %s"
msgstr ""
-#: ../yum/__init__.py:1477
+#: ../yum/__init__.py:1574
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1968,347 +2126,357 @@ msgid ""
" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1526
+#: ../yum/__init__.py:1623
msgid "Header is not complete."
msgstr ""
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1660
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1618
+#: ../yum/__init__.py:1715
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1622
+#: ../yum/__init__.py:1719
#, python-format
msgid "Problem opening package %s"
msgstr ""
-#: ../yum/__init__.py:1630
+#: ../yum/__init__.py:1727
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1634
+#: ../yum/__init__.py:1731
#, python-format
msgid "Package %s is not signed"
msgstr ""
-#: ../yum/__init__.py:1672
+#: ../yum/__init__.py:1769
#, python-format
msgid "Cannot remove %s"
msgstr ""
-#: ../yum/__init__.py:1676
+#: ../yum/__init__.py:1773
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1712
+#: ../yum/__init__.py:1819
#, python-format
msgid "Cannot remove %s file %s"
msgstr ""
-#: ../yum/__init__.py:1716
+#: ../yum/__init__.py:1823
#, python-format
msgid "%s file %s removed"
msgstr ""
-#: ../yum/__init__.py:1718
+#: ../yum/__init__.py:1825
#, python-format
msgid "%d %s files removed"
msgstr ""
-#: ../yum/__init__.py:1787
+#: ../yum/__init__.py:1894
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1793
+#: ../yum/__init__.py:1900
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:2026
+#: ../yum/__init__.py:2179
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:2065
+#: ../yum/__init__.py:2218
#, python-format
msgid "Searching %d packages"
msgstr ""
-#: ../yum/__init__.py:2069
+#: ../yum/__init__.py:2222
#, python-format
msgid "searching package %s"
msgstr ""
-#: ../yum/__init__.py:2081
+#: ../yum/__init__.py:2234
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:2088
+#: ../yum/__init__.py:2241
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:2121
+#: ../yum/__init__.py:2274
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: ../yum/__init__.py:2170
+#: ../yum/__init__.py:2323
msgid "No group data available for configured repositories"
msgstr ""
-#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
-#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
-#: ../yum/__init__.py:2655
+#: ../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
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
+#: ../yum/__init__.py:2385 ../yum/__init__.py:2512
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:2279
+#: ../yum/__init__.py:2432
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:2283
+#: ../yum/__init__.py:2436
#, python-format
msgid "No package named %s available to be installed"
msgstr ""
-#: ../yum/__init__.py:2380
+#: ../yum/__init__.py:2538
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:2399
+#: ../yum/__init__.py:2557
#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
+#: ../yum/__init__.py:2613 ../yum/__init__.py:2663
msgid "Invalid version flag"
msgstr ""
-#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
+#: ../yum/__init__.py:2633 ../yum/__init__.py:2638
#, python-format
msgid "No Package found for %s"
msgstr ""
-#: ../yum/__init__.py:2696
+#: ../yum/__init__.py:2854
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2700
+#: ../yum/__init__.py:2858
msgid "Nothing specified to install"
msgstr ""
-#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
+#: ../yum/__init__.py:2874 ../yum/__init__.py:3651
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
-#: ../yum/__init__.py:3495
+#: ../yum/__init__.py:2880 ../yum/__init__.py:3196 ../yum/__init__.py:3364
+#: ../yum/__init__.py:3657
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#: ../yum/__init__.py:2798
+#: ../yum/__init__.py:2956
#, python-format
msgid "Package %s installed and not available"
msgstr ""
-#: ../yum/__init__.py:2801
+#: ../yum/__init__.py:2959
msgid "No package(s) available to install"
msgstr ""
-#: ../yum/__init__.py:2813
+#: ../yum/__init__.py:2971
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2839
+#: ../yum/__init__.py:2997
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr ""
-#: ../yum/__init__.py:2842
+#: ../yum/__init__.py:3000
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr ""
-#: ../yum/__init__.py:2850
+#: ../yum/__init__.py:3008
#, python-format
msgid "Package %s already installed and latest version"
msgstr ""
-#: ../yum/__init__.py:2864
+#: ../yum/__init__.py:3022
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
#. update everything (the easy case)
-#: ../yum/__init__.py:2966
+#: ../yum/__init__.py:3125
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
-#: ../yum/__init__.py:3155
+#: ../yum/__init__.py:3146 ../yum/__init__.py:3261 ../yum/__init__.py:3288
+#: ../yum/__init__.py:3314
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
+#: ../yum/__init__.py:3181 ../yum/__init__.py:3361
#, python-format
msgid "%s"
msgstr ""
-#: ../yum/__init__.py:3093
+#: ../yum/__init__.py:3252
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3124
+#: ../yum/__init__.py:3283
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr ""
-#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#: ../yum/__init__.py:3292 ../yum/__init__.py:3318
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:3218
+#: ../yum/__init__.py:3377
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
+#: ../yum/__init__.py:3411
#, python-format
-msgid "Cannot open file: %s. Skipping."
+msgid "Cannot open: %s. Skipping."
msgstr ""
-#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
+#: ../yum/__init__.py:3414 ../yum/__init__.py:3513 ../yum/__init__.py:3597
#, python-format
msgid "Examining %s: %s"
msgstr ""
-#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#: ../yum/__init__.py:3422 ../yum/__init__.py:3516 ../yum/__init__.py:3600
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
-#: ../yum/__init__.py:3270
+#: ../yum/__init__.py:3430
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
+#: ../yum/__init__.py:3459 ../yum/__init__.py:3521 ../yum/__init__.py:3605
#, python-format
msgid "Excluding %s"
msgstr ""
-#: ../yum/__init__.py:3304
+#: ../yum/__init__.py:3464
#, python-format
msgid "Marking %s to be installed"
msgstr ""
-#: ../yum/__init__.py:3310
+#: ../yum/__init__.py:3470
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:3317
+#: ../yum/__init__.py:3477
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:3379
+#: ../yum/__init__.py:3510 ../yum/__init__.py:3594
+#, python-format
+msgid "Cannot open file: %s. Skipping."
+msgstr ""
+
+#: ../yum/__init__.py:3540
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
+#: ../yum/__init__.py:3553 ../yum/__init__.py:3685
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr ""
-#: ../yum/__init__.py:3413
+#: ../yum/__init__.py:3574
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
-#: ../yum/__init__.py:3515
+#: ../yum/__init__.py:3677
msgid "No package(s) available to downgrade"
msgstr ""
-#: ../yum/__init__.py:3559
+#: ../yum/__init__.py:3730
#, python-format
msgid "No Match for available package: %s"
msgstr ""
-#: ../yum/__init__.py:3565
+#: ../yum/__init__.py:3737
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr ""
-#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#: ../yum/__init__.py:3807 ../yum/__init__.py:3844
#, python-format
msgid "Failed to downgrade: %s"
msgstr ""
-#: ../yum/__init__.py:3704
+#: ../yum/__init__.py:3876
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:3724
+#: ../yum/__init__.py:3896
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:3735
+#: ../yum/__init__.py:3902
+#, python-format
+msgid "Invalid GPG Key from %s: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3911
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:3767
+#: ../yum/__init__.py:3943
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
+#: ../yum/__init__.py:3948 ../yum/__init__.py:4010
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:3789
+#: ../yum/__init__.py:3965
msgid "Not installing key"
msgstr ""
-#: ../yum/__init__.py:3795
+#: ../yum/__init__.py:3971
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
+#: ../yum/__init__.py:3972 ../yum/__init__.py:4031
msgid "Key imported successfully"
msgstr ""
-#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
+#: ../yum/__init__.py:3977 ../yum/__init__.py:4036
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2316,41 +2484,46 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:3810
+#: ../yum/__init__.py:3986
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:3829
+#: ../yum/__init__.py:4005
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr ""
-#: ../yum/__init__.py:3849
+#: ../yum/__init__.py:4025
#, python-format
msgid "Not installing key for repo %s"
msgstr ""
-#: ../yum/__init__.py:3854
+#: ../yum/__init__.py:4030
msgid "Key import failed"
msgstr ""
-#: ../yum/__init__.py:3976
+#: ../yum/__init__.py:4156
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:3978
+#: ../yum/__init__.py:4158
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:4028
+#: ../yum/__init__.py:4208
#, python-format
msgid "Please report this error at %s"
msgstr ""
-#: ../yum/__init__.py:4052
+#: ../yum/__init__.py:4232
msgid "Test Transaction Errors: "
msgstr ""
+#: ../yum/__init__.py:4333
+#, python-format
+msgid "Could not set cachedir: %s"
+msgstr ""
+
#. Mostly copied from YumOutput._outKeyValFill()
#: ../yum/plugins.py:202
msgid "Loaded plugins: "
@@ -2409,7 +2582,20 @@ msgstr ""
msgid "registration of commands not supported"
msgstr ""
-#: ../yum/rpmtrans.py:78
+#: ../yum/rpmsack.py:102
+msgid "has missing requires of"
+msgstr ""
+
+#: ../yum/rpmsack.py:105
+msgid "has installed conflicts"
+msgstr ""
+
+#: ../yum/rpmsack.py:114
+#, python-format
+msgid "%s is a duplicate with %s"
+msgstr ""
+
+#: ../yum/rpmtrans.py:79
msgid "Repackaging"
msgstr ""
diff --git a/utils.py b/utils.py
index 2b0f655..dd6b642 100644
--- a/utils.py
+++ b/utils.py
@@ -92,7 +92,7 @@ def get_process_info(pid):
ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21])
ps['state'] = {'R' : _('Running'),
'S' : _('Sleeping'),
- 'D' : _('Uninteruptable'),
+ 'D' : _('Uninterruptible'),
'Z' : _('Zombie'),
'T' : _('Traced/Stopped')
}.get(ps_stat[2], _('Unknown'))
commit f86b0129812bdb3a95058bb0559fb624e330cfd7
Author: Seth Vidal <skvidal at fedoraproject.org>
Date: Wed Feb 10 10:32:02 2010 -0500
cleanup sql_esc[_glob]
move sql_esc and sql_esc_glob to sqlutils from sqlitesack
add sql_esc'ing to pkgtag db calls
remove sql_esc duplication from history.py
diff --git a/yum/history.py b/yum/history.py
index 8de7459..e9ea94a 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -22,7 +22,7 @@ import os, os.path
import glob
from weakref import proxy as weakref
-from sqlutils import sqlite, executeSQL
+from sqlutils import sqlite, executeSQL, sql_esc, sql_esc_glob
import yum.misc as misc
import yum.constants
from yum.constants import *
@@ -55,31 +55,6 @@ _sttxt2stcode = {'Update' : TS_UPDATE,
'Obsoleted' : TS_OBSOLETED,
'Obsoleting' : TS_OBSOLETING}
-# ---- horrible Copy and paste from sqlitesack ----
-def _sql_esc(pattern):
- """ Apply SQLite escaping, if needed. Returns pattern and esc. """
- esc = ''
- if "_" in pattern or "%" in pattern:
- esc = ' ESCAPE "!"'
- pattern = pattern.replace("!", "!!")
- pattern = pattern.replace("%", "!%")
- pattern = pattern.replace("_", "!_")
- return (pattern, esc)
-
-def _sql_esc_glob(patterns):
- """ Converts patterns to SQL LIKE format, if required (or gives up if
- not possible). """
- ret = []
- for pattern in patterns:
- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done.
- return [] # So Load everything
-
- # Convert to SQL LIKE format
- (pattern, esc) = _sql_esc(pattern)
- pattern = pattern.replace("*", "%")
- pattern = pattern.replace("?", "_")
- ret.append((pattern, esc))
- return ret
def _setupHistorySearchSQL(patterns=None, ignore_case=False):
"""Setup need_full and patterns for _yieldSQLDataList, also see if
@@ -104,7 +79,7 @@ def _setupHistorySearchSQL(patterns=None, ignore_case=False):
if len(patterns) > pat_max:
patterns = []
if ignore_case:
- patterns = _sql_esc_glob(patterns)
+ patterns = sql_esc_glob(patterns)
else:
tmp = []
need_glob = False
diff --git a/yum/pkgtag_db.py b/yum/pkgtag_db.py
index eddf175..e72fd05 100644
--- a/yum/pkgtag_db.py
+++ b/yum/pkgtag_db.py
@@ -18,7 +18,7 @@
# parse sqlite tag database
# return pkgnames and tag that was matched
import sqlite3 as sqlite
-from sqlutils import executeSQL
+from sqlutils import executeSQL, sql_esc, sql_esc_glob
from Errors import PkgTagsError
import sqlutils
import sys
@@ -68,8 +68,9 @@ class PackageTagDB(object):
"""Search by tag name/glob
Return dict of dict[packagename] = [stringmatched, stringmatched, ...]"""
res = {}
- tag = '%%%s%%' % tag
- query = "SELECT name, tag, score FROM packagetags where tag like ?"
+ (tag, esc) = sql_esc(tag)
+ query = "SELECT name, tag, score FROM packagetags where tag like ? %s" % esc
+ tag = '%' + tag + '%'
rows = self._sql_exec(query, (tag,))
for (name, tag, score) in rows:
if name not in res:
@@ -82,8 +83,9 @@ class PackageTagDB(object):
"""Search by package name/glob.
Return dict of dict[packagename] = [tag1, tag2, tag3, tag4, ...]"""
res = {}
- name = '%%%s%%' % name
- query = "SELECT name, tag, score FROM packagetags where name like ?"
+ (name, esc) = sql_esc(tag)
+ query = "SELECT name, tag, score FROM packagetags where name like ?%s " % esc
+ name = '%' + name + '%'
rows = self._sql_exec(query, (name,))
for (name, tag, score) in rows:
if name not in res:
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index bf0cea9..33c088c 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -28,7 +28,7 @@ from packages import PackageObject, RpmBase, YumAvailablePackage, parsePackages
import Errors
import misc
-from sqlutils import executeSQL
+from sqlutils import executeSQL, sql_esc, sql_esc_glob
import rpmUtils.miscutils
import sqlutils
import constants
@@ -812,32 +812,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
pkgs.append(pkg)
return pkgs
- @staticmethod
- def _sql_esc(pattern):
- """ Apply SQLite escaping, if needed. Returns pattern and esc. """
- esc = ''
- if "_" in pattern or "%" in pattern:
- esc = ' ESCAPE "!"'
- pattern = pattern.replace("!", "!!")
- pattern = pattern.replace("%", "!%")
- pattern = pattern.replace("_", "!_")
- return (pattern, esc)
-
- def _sql_esc_glob(self, patterns):
- """ Converts patterns to SQL LIKE format, if required (or gives up if
- not possible). """
- ret = []
- for pattern in patterns:
- if '[' in pattern: # LIKE only has % and _, so [abc] can't be done.
- return [] # So Load everything
-
- # Convert to SQL LIKE format
- (pattern, esc) = self._sql_esc(pattern)
- pattern = pattern.replace("*", "%")
- pattern = pattern.replace("?", "_")
- ret.append((pattern, esc))
- return ret
-
def _skip_all(self):
""" Are we going to skip every package in all our repos? """
skip_all = True
@@ -917,12 +891,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
sql_params = []
dirname_check = ""
if not glob:
- (pattern, esc) = self._sql_esc(filename)
+ (pattern, esc) = sql_esc(filename)
dirname_check = "dirname = ? and filenames LIKE ? %s and " % esc
sql_params.append(dirname)
sql_params.append('%' + pattern + '%')
elif not file_glob:
- (pattern, esc) = self._sql_esc(filename)
+ (pattern, esc) = sql_esc(filename)
dirname_check = "dirname GLOB ? and filenames LIKE ? %s and " % esc
sql_params.append(dirname)
sql_params.append('%' + pattern + '%')
@@ -996,7 +970,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return result
searchstring = searchstring.replace("'", "''")
- (searchstring, esc) = self._sql_esc(searchstring)
+ (searchstring, esc) = sql_esc(searchstring)
sql = "select DISTINCT pkgKey from packages where %s like '%%%s%%'%s " % (fields[0], searchstring, esc)
for f in fields[1:]:
@@ -1042,7 +1016,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
for s in searchstrings:
s = s.replace("'", "''")
- (s, esc) = self._sql_esc(s)
+ (s, esc) = sql_esc(s)
sql="select pkgKey,1 AS cumul from packages where %s like '%%%s%%'%s " % (fields[0], s, esc)
for f in fields[1:]:
sql = "%s or %s like '%%%s%%'%s " % (sql, f, s, esc)
@@ -1516,7 +1490,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
if len(patterns) > pat_max:
patterns = []
if ignore_case:
- patterns = self._sql_esc_glob(patterns)
+ patterns = sql_esc_glob(patterns)
else:
tmp = []
need_glob = False
diff --git a/yum/sqlutils.py b/yum/sqlutils.py
index 4326910..4d7e36e 100644
--- a/yum/sqlutils.py
+++ b/yum/sqlutils.py
@@ -173,3 +173,27 @@ else:
executeSQL = executeSQLPyFormat
+def sql_esc(pattern):
+ """ Apply SQLite escaping, if needed. Returns pattern and esc. """
+ esc = ''
+ if "_" in pattern or "%" in pattern:
+ esc = ' ESCAPE "!"'
+ pattern = pattern.replace("!", "!!")
+ pattern = pattern.replace("%", "!%")
+ pattern = pattern.replace("_", "!_")
+ return (pattern, esc)
+
+def sql_esc_glob(patterns):
+ """ Converts patterns to SQL LIKE format, if required (or gives up if
+ not possible). """
+ ret = []
+ for pattern in patterns:
+ if '[' in pattern: # LIKE only has % and _, so [abc] can't be done.
+ return [] # So Load everything
+
+ # Convert to SQL LIKE format
+ (pattern, esc) = sql_esc(pattern)
+ pattern = pattern.replace("*", "%")
+ pattern = pattern.replace("?", "_")
+ ret.append((pattern, esc))
+ return ret
More information about the Yum-commits
mailing list