- legacy signatures always checked where possible on package read.

- wire transactions through rpmcli build modes.
- lazy rpmdb open/close through transaction methods (mostly anyways).
- no-brainer refcounts for rpmdb object.
- check added header against transaction set, replace if newer.

CVS patchset: 5135
CVS date: 2001/10/27 20:09:20

1 files changed, 155 insertions, 150 deletions

diff --git a/po/id.po b/po/id.po
index 285b4d05b..9935eb869 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-26 00:15-0400\n"
+"POT-Creation-Date: 2001-10-27 15:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,71 +14,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:37
-#, c-format
-msgid "cannot open rpm database in %s\n"
-msgstr ""
-
-#: build.c:48
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:81
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:159 build.c:171
+#: build.c:143 build.c:155
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:178
+#: build.c:162
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:206
+#: build.c:190
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:229
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:250
+#: build.c:234
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:259
+#: build.c:243
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:314
+#: build.c:301
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:329
+#: build.c:316
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:55
+#: rpm2cpio.c:47
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:61
+#: rpm2cpio.c:53
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:83
+#: rpm2cpio.c:75
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:963
+#: rpmqv.c:961
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1038
+#: rpmqv.c:1031
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1040
+#: rpmqv.c:1033
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1059
+#: rpmqv.c:1052
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1070
+#: rpmqv.c:1063
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1118
+#: rpmqv.c:1111
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1132
+#: rpmqv.c:1125
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1140
+#: rpmqv.c:1133
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1156
+#: rpmqv.c:1149
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:487
+#: build/build.c:125 build/pack.c:479
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:148
+#: build/files.c:1777 build/pack.c:146
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:79
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:84
+#: build/pack.c:82
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:106
+#: build/pack.c:104
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:113
+#: build/pack.c:111
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:216
+#: build/pack.c:214
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:223
+#: build/pack.c:221
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:228
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:237
+#: build/pack.c:235
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:245
+#: build/pack.c:243
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:260
+#: build/pack.c:258
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:288
+#: build/pack.c:286
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:298
+#: build/pack.c:296
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:307 build/pack.c:529
+#: build/pack.c:305 build/pack.c:521
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:341
+#: build/pack.c:333
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:350
+#: build/pack.c:342
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:475
+#: build/pack.c:467
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:485
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:501
+#: build/pack.c:493
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:528
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:546
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:559
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:575
+#: build/pack.c:567
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:611 lib/psm.c:2153
+#: build/pack.c:603 lib/psm.c:2152
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:618
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:628
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:650
+#: build/pack.c:642
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:660
+#: build/pack.c:652
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:666
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:691 lib/psm.c:2419
+#: build/pack.c:683 lib/psm.c:2418
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:758
+#: build/pack.c:750
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:775
+#: build/pack.c:767
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1416,72 +1411,92 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:555
+#: lib/depends.c:668
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:584
+#: lib/depends.c:697
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
+#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:815
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/depends.c:995
+#, c-format
+msgid "newer package %s already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:1000
+#, c-format
+msgid "package %s already added, ignoring\n"
+msgstr ""
+
+#: lib/depends.c:1005
+#, c-format
+msgid "older package %s already added, replacing with %s\n"
+msgstr ""
+
+#: lib/depends.c:1256
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1155
+#: lib/depends.c:1367
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1249
+#: lib/depends.c:1461
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1278
+#: lib/depends.c:1490
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1295
+#: lib/depends.c:1507
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1319
+#: lib/depends.c:1531
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1332
+#: lib/depends.c:1544
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1346
+#: lib/depends.c:1558
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1362
+#: lib/depends.c:1574
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1383
+#: lib/depends.c:1595
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1504,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1456
+#: lib/depends.c:1668
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1535
+#: lib/depends.c:1747
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1788
+#: lib/depends.c:2000
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1938
+#: lib/depends.c:2150
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1998
+#: lib/depends.c:2210
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2048
+#: lib/depends.c:2260
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2101
+#: lib/depends.c:2313
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2131
+#: lib/depends.c:2343
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2241,64 +2256,64 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1217
+#: lib/psm.c:1216
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1330
+#: lib/psm.c:1329
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1436
+#: lib/psm.c:1435
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1604
+#: lib/psm.c:1603
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1610
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1958
+#: lib/psm.c:1957
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2075
+#: lib/psm.c:2074
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2190
+#: lib/psm.c:2189
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2199
+#: lib/psm.c:2198
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2240
+#: lib/psm.c:2239
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2241
+#: lib/psm.c:2240
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2427
+#: lib/psm.c:2426
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2430
+#: lib/psm.c:2429
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
-#: lib/rpminstall.c:838
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464
+#: lib/rpminstall.c:834
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
@@ -2361,7 +2376,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:476
+#: lib/query.c:648 lib/rpminstall.c:477
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
@@ -2420,7 +2435,7 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:624
+#: lib/query.c:854 lib/rpminstall.c:620
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2496,58 +2511,53 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:228
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:279
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:295
+#: lib/rpminstall.c:289
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:299
+#: lib/rpminstall.c:293
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:388
+#: lib/rpminstall.c:389
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:438
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:443
+#: lib/rpminstall.c:444
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:455 lib/rpminstall.c:694
+#: lib/rpminstall.c:456 lib/rpminstall.c:690
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:491
+#: lib/rpminstall.c:492
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:507
+#: lib/rpminstall.c:508
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:529
 msgid "installing binary packages\n"
 msgstr ""
 
@@ -2556,26 +2566,21 @@ msgstr ""
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:611
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
-
-#: lib/rpminstall.c:627
+#: lib/rpminstall.c:623
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651
+#: lib/rpminstall.c:647
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:676
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:686
+#: lib/rpminstall.c:682
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:935
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3029,125 +3034,125 @@ msgstr ""
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:889
+#: rpmdb/rpmdb.c:892
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1028
+#: rpmdb/rpmdb.c:1034
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1273
+#: rpmdb/rpmdb.c:1291
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310
+#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2110
+#: rpmdb/rpmdb.c:2121
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2380
+#: rpmdb/rpmdb.c:2391
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2452
+#: rpmdb/rpmdb.c:2463
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2461
+#: rpmdb/rpmdb.c:2472
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2662
+#: rpmdb/rpmdb.c:2673
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2743
+#: rpmdb/rpmdb.c:2754
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2754
+#: rpmdb/rpmdb.c:2765
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3196
+#: rpmdb/rpmdb.c:3207
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3229
+#: rpmdb/rpmdb.c:3240
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3256
+#: rpmdb/rpmdb.c:3267
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3260
+#: rpmdb/rpmdb.c:3271
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3266
+#: rpmdb/rpmdb.c:3277
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3268
+#: rpmdb/rpmdb.c:3279
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3275
+#: rpmdb/rpmdb.c:3286
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3286
+#: rpmdb/rpmdb.c:3297
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3350
+#: rpmdb/rpmdb.c:3361
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3368
+#: rpmdb/rpmdb.c:3379
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3387
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3389
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3388
+#: rpmdb/rpmdb.c:3399
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3390
+#: rpmdb/rpmdb.c:3401
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""