- install rpmal.h and rpmhash.h, implicit rpmps.hinclude, for now.

- revert headerFree/headerLink/headerUnlink debugging.

CVS patchset: 5550
CVS date: 2002/07/13 19:08:51

1 files changed, 224 insertions, 224 deletions

diff --git a/po/wa.po b/po/wa.po
index a9f56752a..4ed2edd81 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 18:01-0400\n"
+"POT-Creation-Date: 2002-07-13 15:09-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1396
+#: build/pack.c:629 lib/psm.c:1394
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:710 lib/psm.c:1686
+#: build/pack.c:710 lib/psm.c:1684
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1410,77 +1410,77 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:167
+#: lib/depends.c:162
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:393
+#: lib/depends.c:388
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:419
+#: lib/depends.c:414
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:436
+#: lib/depends.c:431
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:458
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:471
+#: lib/depends.c:466
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:484
+#: lib/depends.c:479
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:828
+#: lib/depends.c:823
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:950
+#: lib/depends.c:945
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1228
+#: lib/depends.c:1177
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1334
+#: lib/depends.c:1278
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1427
+#: lib/depends.c:1361
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1497
+#: lib/depends.c:1431
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1532
+#: lib/depends.c:1466
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1537
+#: lib/depends.c:1471
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
-#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:383
+#: rpmdb/header.c:3122 rpmdb/header.c:3145 rpmdb/header.c:3169
 msgid "(not a number)"
 msgstr ""
 
@@ -1492,11 +1492,11 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:233 lib/formats.c:280
+#: lib/formats.c:233 lib/formats.c:282
 msgid "(not a blob)"
 msgstr ""
 
-#: lib/formats.c:303
+#: lib/formats.c:307
 msgid "(not a OpenPGP signature"
 msgstr ""
 
@@ -1525,46 +1525,46 @@ msgstr ""
 msgid "file %s is on an unknown device\n"
 msgstr ""
 
-#: lib/fsm.c:334
+#: lib/fsm.c:332
 msgid "========== Directories not explictly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:336
+#: lib/fsm.c:334
 #, c-format
 msgid "%10d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1244
+#: lib/fsm.c:1242
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1539
+#: lib/fsm.c:1537
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1666 lib/fsm.c:1798
+#: lib/fsm.c:1664 lib/fsm.c:1796
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1824
+#: lib/fsm.c:1822
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1830
+#: lib/fsm.c:1828
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1840
+#: lib/fsm.c:1838
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1860
+#: lib/fsm.c:1858
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -1584,41 +1584,41 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
+#: lib/package.c:214 lib/rpmchecksig.c:211 lib/rpmchecksig.c:668
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:231
+#: lib/package.c:229
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:239
+#: lib/package.c:237
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
+#: lib/package.c:246 lib/rpmchecksig.c:229 lib/rpmchecksig.c:684
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
+#: lib/package.c:250 lib/rpmchecksig.c:233 lib/rpmchecksig.c:689
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:585
+#: lib/package.c:296 lib/rpmchecksig.c:587
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
+#: lib/package.c:331 lib/package.c:356 lib/package.c:386 lib/rpmchecksig.c:760
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
+#: lib/package.c:398 lib/rpmchecksig.c:121 lib/rpmchecksig.c:616
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2046,451 +2046,451 @@ msgstr ""
 
 #. @=boundsread@
 #. @-modfilesys@
-#: lib/psm.c:246 rpmdb/header.c:401 rpmdb/header_internal.c:164
+#: lib/psm.c:244 rpmdb/header.c:387 rpmdb/header_internal.c:164
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/psm.c:442
+#: lib/psm.c:440
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:561
+#: lib/psm.c:559
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:681
+#: lib/psm.c:679
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:849
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:858
+#: lib/psm.c:856
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1181
+#: lib/psm.c:1179
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1303
+#: lib/psm.c:1301
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1447
+#: lib/psm.c:1445
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1456
+#: lib/psm.c:1454
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1498
+#: lib/psm.c:1496
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1499
+#: lib/psm.c:1497
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1694
+#: lib/psm.c:1692
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1697
+#: lib/psm.c:1695
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:123 lib/rpmts.c:286
+#: lib/query.c:122 lib/rpmts.c:285
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:182
+#: lib/query.c:181
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:247
+#: lib/query.c:246
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:250
+#: lib/query.c:249
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:253
+#: lib/query.c:252
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:256
+#: lib/query.c:255
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:259
+#: lib/query.c:258
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:262
+#: lib/query.c:261
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:280
+#: lib/query.c:279
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:313
+#: lib/query.c:312
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:407
+#: lib/query.c:406
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:566 lib/query.c:600 lib/rpminstall.c:362 lib/rpminstall.c:493
-#: lib/rpminstall.c:875 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
+#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:578
+#: lib/query.c:577
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:583
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:610 lib/rpminstall.c:506
+#: lib/query.c:609 lib/rpminstall.c:505
 #, c-format
 msgid "%s: not a package manifest: %s\n"
 msgstr ""
 
-#: lib/query.c:654
+#: lib/query.c:653
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:675
+#: lib/query.c:674
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:695
+#: lib/query.c:694
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:705
+#: lib/query.c:704
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:719 lib/query.c:741 lib/query.c:762 lib/query.c:797
+#: lib/query.c:718 lib/query.c:740 lib/query.c:761 lib/query.c:796
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:729 lib/query.c:747 lib/query.c:772 lib/query.c:802
+#: lib/query.c:728 lib/query.c:746 lib/query.c:771 lib/query.c:801
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:813
+#: lib/query.c:812
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:824
+#: lib/query.c:823
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:858
+#: lib/query.c:857
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:862
+#: lib/query.c:861
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:889
+#: lib/query.c:888
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:892
+#: lib/query.c:891
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:897
+#: lib/query.c:896
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:908 lib/rpminstall.c:660
+#: lib/query.c:907 lib/rpminstall.c:659
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:698
+#: lib/rpmal.c:696
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:775
+#: lib/rpmal.c:773
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:60
+#: lib/rpmchecksig.c:59
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:72
+#: lib/rpmchecksig.c:71
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:116
+#: lib/rpmchecksig.c:115
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:216
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:218
+#: lib/rpmchecksig.c:220
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:318
+#: lib/rpmchecksig.c:320
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:348
+#: lib/rpmchecksig.c:350
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:354
+#: lib/rpmchecksig.c:356
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:447
+#: lib/rpmchecksig.c:449
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:452
+#: lib/rpmchecksig.c:454
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:457
+#: lib/rpmchecksig.c:459
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:599
+#: lib/rpmchecksig.c:601
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:674
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:920
+#: lib/rpmchecksig.c:922
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
+#: lib/rpmchecksig.c:925 lib/rpmchecksig.c:939
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
+#: lib/rpmchecksig.c:928 lib/rpmchecksig.c:942
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:934
+#: lib/rpmchecksig.c:936
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:449 lib/rpmds.c:616
+#: lib/rpmds.c:448 lib/rpmds.c:615
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:449 lib/rpmds.c:616
+#: lib/rpmds.c:448 lib/rpmds.c:615
 msgid "YES"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:584
+#: lib/rpmds.c:583
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:615
+#: lib/rpmds.c:614
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:639
+#: lib/rpmds.c:638
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:609
+#: lib/rpmfi.c:607
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:613
+#: lib/rpmfi.c:611
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:616
+#: lib/rpmfi.c:614
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:686
+#: lib/rpmfi.c:684
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:752
+#: lib/rpmfi.c:750
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:762
+#: lib/rpmfi.c:760
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:841
+#: lib/rpmfi.c:839
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:167
+#: lib/rpminstall.c:166
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:169
+#: lib/rpminstall.c:168
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:309
+#: lib/rpminstall.c:308
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:321
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:326
+#: lib/rpminstall.c:325
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:416
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:467
+#: lib/rpminstall.c:466
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:473
+#: lib/rpminstall.c:472
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:485 lib/rpminstall.c:731 tools/rpmgraph.c:156
+#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:521
+#: lib/rpminstall.c:520
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:535 lib/rpminstall.c:688 lib/rpminstall.c:1062
+#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061
 #: tools/rpmgraph.c:202
 msgid "Failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:542 tools/rpmgraph.c:208
+#: lib/rpminstall.c:541 tools/rpmgraph.c:208
 msgid "    Suggested resolutions:\n"
 msgstr ""
 
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:571
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:592
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:663
+#: lib/rpminstall.c:662
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:718
+#: lib/rpminstall.c:717
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:723
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1056
+#: lib/rpminstall.c:1055
 #, c-format
 msgid "rollback %d packages to %s"
 msgstr ""
@@ -2500,35 +2500,35 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmlibprov.c:30
+#: lib/rpmlibprov.c:29
 msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
 msgstr ""
 
-#: lib/rpmlibprov.c:33
+#: lib/rpmlibprov.c:32
 msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
-#: lib/rpmlibprov.c:36
+#: lib/rpmlibprov.c:35
 msgid "package payload is compressed using bzip2."
 msgstr ""
 
-#: lib/rpmlibprov.c:39
+#: lib/rpmlibprov.c:38
 msgid "package payload file(s) have \"./\" prefix."
 msgstr ""
 
-#: lib/rpmlibprov.c:42
+#: lib/rpmlibprov.c:41
 msgid "package name-version-release is not implicitly provided."
 msgstr ""
 
-#: lib/rpmlibprov.c:45
+#: lib/rpmlibprov.c:44
 msgid "header tags are always sorted after being loaded."
 msgstr ""
 
-#: lib/rpmlibprov.c:48
+#: lib/rpmlibprov.c:47
 msgid "the scriptlet interpreter can use arguments from header."
 msgstr ""
 
-#: lib/rpmlibprov.c:51
+#: lib/rpmlibprov.c:50
 msgid "a hardlink file set may be installed without being complete."
 msgstr ""
 
@@ -2701,170 +2701,170 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/rpmts.c:136 lib/rpmts.c:193
+#: lib/rpmts.c:135 lib/rpmts.c:192
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
 #. Get available space on mounted file systems.
-#: lib/rpmts.c:584
+#: lib/rpmts.c:583
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:133
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:151
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:157
+#: lib/signature.c:156
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:178
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:183
+#: lib/signature.c:182
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:194
+#: lib/signature.c:193
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:250
+#: lib/signature.c:249
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:454 lib/signature.c:733
-#: lib/signature.c:772
+#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732
+#: lib/signature.c:771
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:357
+#: lib/signature.c:356
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:363
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:370
+#: lib/signature.c:369
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:502
+#: lib/signature.c:387 lib/signature.c:501
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:392
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:471
+#: lib/signature.c:470
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:478
+#: lib/signature.c:477
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:484
+#: lib/signature.c:483
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:507
+#: lib/signature.c:506
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:777 lib/signature.c:832
+#: lib/signature.c:776 lib/signature.c:831
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:809
+#: lib/signature.c:808
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:824
+#: lib/signature.c:823
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:871
+#: lib/signature.c:870
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:909
+#: lib/signature.c:908
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:960
+#: lib/signature.c:959
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1152
+#: lib/signature.c:1151
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1264
+#: lib/signature.c:1263
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1265
+#: lib/signature.c:1264
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1341
+#: lib/signature.c:1340
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1368
+#: lib/signature.c:1367
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1372
+#: lib/signature.c:1371
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:105
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:909
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/verify.c:289
+#: lib/verify.c:288
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:390
+#: lib/verify.c:389
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
@@ -2949,77 +2949,77 @@ msgstr ""
 
 #. This should not be allowed
 #. @-modfilesys@
-#: rpmdb/header.c:360
+#: rpmdb/header.c:346
 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2312
+#: rpmdb/header.c:2298
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2342
+#: rpmdb/header.c:2328
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2356
+#: rpmdb/header.c:2342
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2370
+#: rpmdb/header.c:2356
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2387
+#: rpmdb/header.c:2373
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2414
+#: rpmdb/header.c:2400
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2432
+#: rpmdb/header.c:2418
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2436
+#: rpmdb/header.c:2422
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2505
+#: rpmdb/header.c:2491
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2514
+#: rpmdb/header.c:2500
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2527 rpmdb/header.c:2572
+#: rpmdb/header.c:2513 rpmdb/header.c:2558
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2537
+#: rpmdb/header.c:2523
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2557
+#: rpmdb/header.c:2543
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2582
+#: rpmdb/header.c:2568
 msgid "| expected at end of expression"
 msgstr ""
 
@@ -3055,149 +3055,149 @@ msgstr ""
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:712
+#: rpmdb/rpmdb.c:738
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1002 rpmdb/rpmdb.c:1131 rpmdb/rpmdb.c:1181 rpmdb/rpmdb.c:2064
-#: rpmdb/rpmdb.c:2170 rpmdb/rpmdb.c:2880
+#: rpmdb/rpmdb.c:1028 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:1207 rpmdb/rpmdb.c:2090
+#: rpmdb/rpmdb.c:2196 rpmdb/rpmdb.c:2906
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1397
+#: rpmdb/rpmdb.c:1423
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1984
+#: rpmdb/rpmdb.c:2010
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2253
+#: rpmdb/rpmdb.c:2279
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2316
+#: rpmdb/rpmdb.c:2342
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2431
+#: rpmdb/rpmdb.c:2457
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2435
+#: rpmdb/rpmdb.c:2461
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2463
+#: rpmdb/rpmdb.c:2489
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2510
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2494
+#: rpmdb/rpmdb.c:2520
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2641
+#: rpmdb/rpmdb.c:2667
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2855
+#: rpmdb/rpmdb.c:2881
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2859
+#: rpmdb/rpmdb.c:2885
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2899
+#: rpmdb/rpmdb.c:2925
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3248
+#: rpmdb/rpmdb.c:3274
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3285
+#: rpmdb/rpmdb.c:3311
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3317
+#: rpmdb/rpmdb.c:3343
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3321
+#: rpmdb/rpmdb.c:3347
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3327
+#: rpmdb/rpmdb.c:3353
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3329
+#: rpmdb/rpmdb.c:3355
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3336
+#: rpmdb/rpmdb.c:3362
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3347
+#: rpmdb/rpmdb.c:3373
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3371
+#: rpmdb/rpmdb.c:3397
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3411
+#: rpmdb/rpmdb.c:3437
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3429
+#: rpmdb/rpmdb.c:3455
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3437
+#: rpmdb/rpmdb.c:3463
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3439
+#: rpmdb/rpmdb.c:3465
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3449
+#: rpmdb/rpmdb.c:3475
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3451
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""