Use headerNVR throughout.

More const's.

CVS patchset: 3216
CVS date: 1999/08/06 22:52:49

diff --git a/build/pack.c b/build/pack.c
index 7a7035c..89c30ff 100644 (file)
--- a/build/pack.c
+++ b/build/pack.c
@@ -16,24 +16,17 @@ static int addFileToArrayTag(Spec spec, char *file, Header h, int tag);
 static int cpio_gzip(FD_t fdo, CSA_t *csa);
 static int cpio_copy(FD_t fdo, CSA_t *csa);
 
-static int genSourceRpmName(Spec spec)
+static inline int genSourceRpmName(Spec spec)
 {
-    char *name, *version, *release;
-    char fileName[BUFSIZ];
+    if (spec->sourceRpmName == NULL) {
+       const char *name, *version, *release;
+       char fileName[BUFSIZ];
 
-    if (spec->sourceRpmName) {
-       return 0;
-    }
-    
-    headerGetEntry(spec->packages->header, RPMTAG_NAME,
-                  NULL, (void **)&name, NULL);
-    headerGetEntry(spec->packages->header, RPMTAG_VERSION,
-                  NULL, (void **)&version, NULL);
-    headerGetEntry(spec->packages->header, RPMTAG_RELEASE,
-                  NULL, (void **)&release, NULL);
-    sprintf(fileName, "%s-%s-%s.%ssrc.rpm", name, version, release,
+       headerNVR(spec->packages->header, &name, &version, &release);
+       sprintf(fileName, "%s-%s-%s.%ssrc.rpm", name, version, release,
            spec->noSource ? "no" : "");
-    spec->sourceRpmName = strdup(fileName);
+       spec->sourceRpmName = strdup(fileName);
+    }
 
     return 0;
 }
@@ -217,14 +210,13 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, Header *sig
     return 0;
 }
 
-int writeRPM(Header header, const char *fileName, int type,
+int writeRPM(Header h, const char *fileName, int type,
                    CSA_t *csa, char *passPhrase, char **cookie)
 {
     FD_t fd, ifd;
     int rc, count, sigtype;
     int archnum, osnum;
     const char *sigtarget;
-    char *name, *version, *release;
     char buf[BUFSIZ];
     Header sig;
     struct rpmlead lead;
@@ -232,7 +224,7 @@ int writeRPM(Header header, const char *fileName, int type,
     if (fdFileno(csa->cpioFdIn) < 0) {
        csa->cpioArchiveSize = 0;
        /* Add a bogus archive size to the Header */
-       headerAddEntry(header, RPMTAG_ARCHIVESIZE, RPM_INT32_TYPE,
+       headerAddEntry(h, RPMTAG_ARCHIVESIZE, RPM_INT32_TYPE,
                &csa->cpioArchiveSize, 1);
     }
 
@@ -240,7 +232,7 @@ int writeRPM(Header header, const char *fileName, int type,
     if (cookie) {
        sprintf(buf, "%s %d", buildHost(), (int) time(NULL));
        *cookie = strdup(buf);
-       headerAddEntry(header, RPMTAG_COOKIE, RPM_STRING_TYPE, *cookie, 1);
+       headerAddEntry(h, RPMTAG_COOKIE, RPM_STRING_TYPE, *cookie, 1);
     }
     
     /* Write the header */
@@ -248,7 +240,7 @@ int writeRPM(Header header, const char *fileName, int type,
        rpmError(RPMERR_CREATE, _("Unable to open temp file"));
        return RPMERR_CREATE;
     }
-    headerWrite(fd, header, HEADER_MAGIC_YES);
+    headerWrite(fd, h, HEADER_MAGIC_YES);
             
     /* Write the archive and get the size */
     if (csa->cpioList != NULL) {
@@ -268,11 +260,11 @@ int writeRPM(Header header, const char *fileName, int type,
 
     /* Now set the real archive size in the Header */
     if (fdFileno(csa->cpioFdIn) < 0) {
-       headerModifyEntry(header, RPMTAG_ARCHIVESIZE,
+       headerModifyEntry(h, RPMTAG_ARCHIVESIZE,
                RPM_INT32_TYPE, &csa->cpioArchiveSize, 1);
     }
     (void)fdLseek(fd, 0,  SEEK_SET);
-    headerWrite(fd, header, HEADER_MAGIC_YES);
+    headerWrite(fd, h, HEADER_MAGIC_YES);
 
     fdClose(fd);
 
@@ -286,10 +278,10 @@ int writeRPM(Header header, const char *fileName, int type,
     }
 
     /* Now write the lead */
-    headerGetEntry(header, RPMTAG_NAME, NULL, (void **)&name, NULL);
-    headerGetEntry(header, RPMTAG_VERSION, NULL, (void **)&version, NULL);
-    headerGetEntry(header, RPMTAG_RELEASE, NULL, (void **)&release, NULL);
-    sprintf(buf, "%s-%s-%s", name, version, release);
+    {  const char *name, *version, *release;
+       headerNVR(h, &name, &version, &release);
+       sprintf(buf, "%s-%s-%s", name, version, release);
+    }
 
     if (fdFileno(csa->cpioFdIn) < 0) {
        rpmGetArchInfo(NULL, &archnum);

diff --git a/lib/depends.c b/lib/depends.c
index 91b6859..e086092 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -5,12 +5,15 @@
 #include "depends.h"
 #include "misc.h"
 
-static int headerNVR(Header h, const char **np, const char **vp, const char **rp)
+int headerNVR(Header h, const char **np, const char **vp, const char **rp)
 {
     int type, count;
-    headerGetEntry(h, RPMTAG_NAME, &type, (void **) np, &count);
-    headerGetEntry(h, RPMTAG_VERSION, &type, (void **) vp, &count);
-    headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) rp, &count);
+    if (np && !headerGetEntry(h, RPMTAG_NAME, &type, (void **) np, &count))
+       *np = NULL;
+    if (vp && !headerGetEntry(h, RPMTAG_VERSION, &type, (void **) vp, &count))
+       *vp = NULL;
+    if (rp && !headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) rp, &count))
+       *rp = NULL;
     return 0;
 }
 
@@ -54,8 +57,8 @@ static void alFree(struct availableList * al)
        if (al->list[i].relocs) {
            r = al->list[i].relocs;
            while (r->oldPath || r->newPath) {
-               if (r->oldPath) free(r->oldPath);
-               if (r->newPath) free(r->newPath);
+               if (r->oldPath) xfree(r->oldPath);
+               if (r->newPath) xfree(r->newPath);
                r++;
            }
 
@@ -511,8 +514,7 @@ int headerMatchesDepFlags(Header h, const char *reqName, const char * reqInfo, i
        sprintf(buf, "%d", *epochval);
        epoch = buf;
     }
-    headerGetEntry(h, RPMTAG_VERSION, &type, (void **)&version, &count);
-    headerGetEntry(h, RPMTAG_RELEASE, &type, (void **)&release, &count);
+    headerNVR(h, NULL, &version, &release);
 
     /* Parse requires version into components */
     Revr = strdup(reqInfo);

diff --git a/lib/install.c b/lib/install.c
index 67fca55..31f640a 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -636,7 +636,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
                         struct sharedFileInfo * sharedList, FD_t scriptFd)
 {
     int rc;
-    char * name, * version, * release;
+    const char * name, * version, * release;
     int fileCount, type, count;
     struct fileInfo * files;
     int_32 installTime;
@@ -657,9 +657,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
     if (flags & RPMTRANS_FLAG_JUSTDB)
        flags |= RPMTRANS_FLAG_NOSCRIPTS;
 
-    headerGetEntry(h, RPMTAG_NAME, &type, (void **) &name, &fileCount);
-    headerGetEntry(h, RPMTAG_VERSION, &type, (void **) &version, &fileCount);
-    headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) &release, &fileCount);
+    headerNVR(h, &name, &version, &release);
 
     rpmMessage(RPMMESS_DEBUG, _("package: %s-%s-%s files test = %d\n"), 
                name, version, release, flags & RPMTRANS_FLAG_TEST);

diff --git a/lib/lookup.c b/lib/lookup.c
index d9db80a..fea5efc 100644 (file)
--- a/lib/lookup.c
+++ b/lib/lookup.c
@@ -13,8 +13,7 @@ int findMatches(rpmdb db, const char * name, const char * version,
     int gotMatches;
     int rc;
     int i;
-    char * pkgRelease, * pkgVersion;
-    int count, type;
+    const char * pkgRelease, * pkgVersion;
     int goodRelease, goodVersion;
     Header h;
 
@@ -28,33 +27,30 @@ int findMatches(rpmdb db, const char * name, const char * version,
 
     /* make sure the version and releases match */
     for (i = 0; i < matches->count; i++) {
-       if (matches->recs[i].recOffset) {
-           h = rpmdbGetRecord(db, matches->recs[i].recOffset);
-           if (h == NULL) {
-               rpmError(RPMERR_DBCORRUPT, 
-                        _("cannot read header at %d for lookup"), 
-                       matches->recs[i].recOffset);
-               dbiFreeIndexRecord(*matches);
-               return 2;
-           }
-
-           headerGetEntry(h, RPMTAG_VERSION, &type, (void **) &pkgVersion, 
-                          &count);
-           headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) &pkgRelease, 
-                          &count);
+       if (matches->recs[i].recOffset == 0)
+           continue;
+
+       h = rpmdbGetRecord(db, matches->recs[i].recOffset);
+       if (h == NULL) {
+           rpmError(RPMERR_DBCORRUPT,_("cannot read header at %d for lookup"), 
+               matches->recs[i].recOffset);
+           dbiFreeIndexRecord(*matches);
+           return 2;
+       }
+
+       headerNVR(h, NULL, &pkgVersion, &pkgRelease);
            
-           goodRelease = goodVersion = 1;
+       goodRelease = goodVersion = 1;
 
-           if (release && strcmp(release, pkgRelease)) goodRelease = 0;
-           if (version && strcmp(version, pkgVersion)) goodVersion = 0;
+       if (release && strcmp(release, pkgRelease)) goodRelease = 0;
+       if (version && strcmp(version, pkgVersion)) goodVersion = 0;
 
-           if (goodRelease && goodVersion) 
-               gotMatches = 1;
-           else 
-               matches->recs[i].recOffset = 0;
+       if (goodRelease && goodVersion) 
+           gotMatches = 1;
+       else 
+           matches->recs[i].recOffset = 0;
 
-           headerFree(h);
-       }
+       headerFree(h);
     }
 
     if (!gotMatches) {
@@ -70,11 +66,9 @@ int findMatches(rpmdb db, const char * name, const char * version,
 /* 2 error */
 int rpmdbFindByHeader(rpmdb db, Header h, dbiIndexSet * matches)
 {
-    char * name, * version, * release;
+    const char * name, * version, * release;
 
-    headerGetEntry(h, RPMTAG_NAME, NULL, (void **) &name, NULL);
-    headerGetEntry(h, RPMTAG_VERSION, NULL, (void **) &version, NULL);
-    headerGetEntry(h, RPMTAG_RELEASE, NULL, (void **) &release, NULL);
+    headerNVR(h, &name, &version, &release);
 
     return findMatches(db, name, version, release, matches);
 }

diff --git a/lib/problems.c b/lib/problems.c
index 86274ea..9a11824 100644 (file)
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -47,21 +47,14 @@ void printDepProblems(FILE * fp, struct rpmDependencyConflict * conflicts,
 
 char * rpmProblemString(rpmProblem prob)
 {
-    char * name, * version, * release;
+    const char * name, * version, * release;
+    const char * altName, * altVersion, * altRelease;
     char * buf;
-    char * altName, * altVersion, * altRelease;
-
-    headerGetEntry(prob.h, RPMTAG_NAME, NULL, (void **) &name, NULL);
-    headerGetEntry(prob.h, RPMTAG_VERSION, NULL, (void **) &version, NULL);
-    headerGetEntry(prob.h, RPMTAG_RELEASE, NULL, (void **) &release, NULL);
-
-    if (prob.altH) {
-       headerGetEntry(prob.altH, RPMTAG_NAME, NULL, (void **) &altName, NULL);
-       headerGetEntry(prob.altH, RPMTAG_VERSION, NULL, (void **) &altVersion, 
-                      NULL);
-       headerGetEntry(prob.altH, RPMTAG_RELEASE, NULL, (void **) &altRelease, 
-                      NULL);
-    }
+
+    headerNVR(prob.h, &name, &version, &release);
+
+    if (prob.altH)
+       headerNVR(prob.altH, &altName, &altVersion, &altRelease);
 
     buf = malloc(strlen(name) + strlen(version) + strlen(release) + 400);
 

diff --git a/lib/query.c b/lib/query.c
index 5e177bb..450a655 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -151,7 +151,7 @@ int showQueryPackage(QVA_t *qva, rpmdb db, Header h)
     int queryFlags = qva->qva_flags;
     const char *queryFormat = qva->qva_queryFormat;
 
-    char * name, * version, * release;
+    const char * name, * version, * release;
     int_32 count, type;
     char * prefix = NULL;
     char ** fileList, ** fileMD5List;
@@ -165,9 +165,7 @@ int showQueryPackage(QVA_t *qva, rpmdb db, Header h)
     uint_16 * fileRdevList;
     int i;
 
-    headerGetEntry(h, RPMTAG_NAME, &type, (void **) &name, &count);
-    headerGetEntry(h, RPMTAG_VERSION, &type, (void **) &version, &count);
-    headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) &release, &count);
+    headerNVR(h, &name, &version, &release);
 
     if (!queryFormat && !queryFlags) {
        fprintf(fp, "%s-%s-%s\n", name, version, release);

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 276b2bc..791464c 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -262,7 +262,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags,
                }
 
                if (defaultReloc) {
-                   free(defaultReloc->oldPath);
+                   xfree(defaultReloc->oldPath);
                    defaultReloc->oldPath = NULL;
                }
 

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 9f7b48f..359dd3f 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -17,6 +17,9 @@ extern "C" {
 int rpmReadPackageInfo(FD_t fd, Header * signatures, Header * hdr);
 int rpmReadPackageHeader(FD_t fd, Header * hdr, int * isSource, int * major,
                         int * minor);
+
+int headerNVR(Header h, const char **np, const char **vp, const char **rp);
+
    /* 0 = success */
    /* 1 = bad magic */
    /* 2 = error */
@@ -321,9 +324,9 @@ int rpmdbFindByHeader(rpmdb db, Header h, dbiIndexSet * matches);
 
 /* we pass these around as an array with a sentinel */
 typedef struct rpmRelocation_s {
-    char * oldPath;    /* NULL here evals to RPMTAG_DEFAULTPREFIX, this */
-                       /* odd behavior is only for backwards compatibility */
-    char * newPath;    /* NULL means to omit the file completely! */
+    const char * oldPath;      /* NULL here evals to RPMTAG_DEFAULTPREFIX, */
+                               /* XXX for backwards compatibility */
+    const char * newPath;      /* NULL means to omit the file completely! */
 } rpmRelocation;
 
 int rpmInstallSourcePackage(const char * root, FD_t fd, const char ** specFile,

diff --git a/lib/transaction.c b/lib/transaction.c
index 3096155..e30c178 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -227,13 +227,12 @@ static Header relocateFileList(struct availablePackage * alp,
                               int allowBadRelocate)
 {
     int numValid, numRelocations;
-    int i, j, madeSwap, rc;
+    int i, j, rc;
     rpmRelocation * nextReloc, * relocations = NULL;
     rpmRelocation * rawRelocations = alp->relocs;
-    rpmRelocation tmpReloc;
-    char ** validRelocations, ** actualRelocations;
-    char ** names;
-    char ** origNames;
+    const char ** validRelocations;
+    const char ** names;
+    const char ** origNames;
     int len = 0;
     char * newName;
     int_32 fileCount;
@@ -261,16 +260,19 @@ static Header relocateFileList(struct availablePackage * alp,
        /* FIXME: default relocations (oldPath == NULL) need to be handled
           in the UI, not rpmlib */
 
-       relocations[i].oldPath =
-           alloca(strlen(rawRelocations[i].oldPath) + 1);
-       strcpy(relocations[i].oldPath, rawRelocations[i].oldPath);
-       stripTrailingSlashes(relocations[i].oldPath);
+       {   const char *s = rawRelocations[i].oldPath;
+           char *t = alloca(strlen(s) + 1);
+           strcpy(t, s);
+           stripTrailingSlashes(t);
+           relocations[i].oldPath = t;
+       }
 
        if (rawRelocations[i].newPath) {
-           relocations[i].newPath =
-               alloca(strlen(rawRelocations[i].newPath) + 1);
-           strcpy(relocations[i].newPath, rawRelocations[i].newPath);
-           stripTrailingSlashes(relocations[i].newPath);
+           const char *s = rawRelocations[i].newPath;
+           char *t = alloca(strlen(s) + 1);
+           strcpy(t, s);
+           stripTrailingSlashes(t);
+           relocations[i].newPath = t;
        } else {
            relocations[i].newPath = NULL;
        }
@@ -287,8 +289,10 @@ static Header relocateFileList(struct availablePackage * alp,
 
     /* stupid bubble sort, but it's probably faster here */
     for (i = 0; i < numRelocations; i++) {
+       int madeSwap;
        madeSwap = 0;
        for (j = 1; j < numRelocations; j++) {
+           rpmRelocation tmpReloc;
            if (strcmp(relocations[j - 1].oldPath,
                       relocations[j].oldPath) > 0) {
                tmpReloc = relocations[j - 1];
@@ -301,6 +305,7 @@ static Header relocateFileList(struct availablePackage * alp,
     }
 
     if (numValid) {
+       const char ** actualRelocations;
        actualRelocations = malloc(sizeof(*actualRelocations) * numValid);
        for (i = 0; i < numValid; i++) {
            for (j = 0; j < numRelocations; j++) {
@@ -317,8 +322,8 @@ static Header relocateFileList(struct availablePackage * alp,
        headerAddEntry(h, RPMTAG_INSTPREFIXES, RPM_STRING_ARRAY_TYPE,
                       (void **) actualRelocations, numValid);
 
-       free(actualRelocations);
-       free(validRelocations);
+       xfree(actualRelocations);
+       xfree(validRelocations);
     }
 
     headerGetEntry(h, RPMTAG_FILENAMES, NULL, (void **) &names,

diff --git a/lib/uninstall.c b/lib/uninstall.c
index 22aa861..79aacc2 100644 (file)
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -70,13 +70,13 @@ int removeBinaryPackage(char * prefix, rpmdb db, unsigned int offset,
     Header h;
     int i;
     int fileCount;
-    char * name, * version, * release;
+    const char * name, * version, * release;
     char * fnbuffer = NULL;
     dbiIndexSet matches;
     int fnbuffersize = 0;
     int prefixLength = strlen(prefix);
     char ** fileList, ** fileMd5List;
-    int type, count;
+    int type;
     uint_32 * fileFlagsList;
     int_16 * fileModesList;
     int scriptArg;
@@ -91,9 +91,8 @@ int removeBinaryPackage(char * prefix, rpmdb db, unsigned int offset,
        return 1;
     }
 
-    headerGetEntry(h, RPMTAG_NAME, &type, (void **) &name,  &count);
-    headerGetEntry(h, RPMTAG_VERSION, &type, (void **) &version,  &count);
-    headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) &release,  &count);
+    headerNVR(h, &name, &version, &release);
+
     /* when we run scripts, we pass an argument which is the number of 
        versions of this package that will be installed when we are finished */
     if (rpmdbFindPackage(db, name, &matches)) {

diff --git a/lib/verify.c b/lib/verify.c
index dde85b1..dc98928 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -306,7 +306,7 @@ static int verifyDependencies(rpmdb db, Header h) {
     struct rpmDependencyConflict * conflicts;
     int numConflicts;
     const char * name, * version, * release;
-    int type, count, i;
+    int i;
 
     rpmdep = rpmtransCreateSet(db, NULL);
     rpmtransAddPackage(rpmdep, h, NULL, NULL, 0, NULL);
@@ -315,9 +315,7 @@ static int verifyDependencies(rpmdb db, Header h) {
     rpmtransFree(rpmdep);
 
     if (numConflicts) {
-       headerGetEntry(h, RPMTAG_NAME, &type, (void **) &name, &count);
-       headerGetEntry(h, RPMTAG_VERSION, &type, (void **) &version, &count);
-       headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) &release, &count);
+       headerNVR(h, &name, &version, &release);
        fprintf(stdout, _("Unsatisfied dependencies for %s-%s-%s: "),
                name, version, release);
        for (i = 0; i < numConflicts; i++) {

diff --git a/po/rpm.pot b/po/rpm.pot
index 7b26402..645a4fe 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-08-02 13:17-0400\n"
+"POT-Creation-Date: 1999-08-06 18:47-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"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "override build root"
 msgstr ""
 
-#: ../build.c:349 ../rpm.c:457
+#: ../build.c:349 ../rpm.c:456
 msgid "remove build tree when done"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "remove specfile when done"
 msgstr ""
 
-#: ../build.c:359 ../rpm.c:455
+#: ../build.c:359 ../rpm.c:454
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -178,1046 +178,1045 @@ msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
 #: ../rpm.c:175
-msgid ""
-"This may be freely redistributed under the terms of the GNU GPL"
+msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: ../rpm.c:184
+#: ../rpm.c:183
 msgid "usage: rpm {--help}"
 msgstr ""
 
-#: ../rpm.c:185
+#: ../rpm.c:184
 msgid "       rpm {--version}"
 msgstr ""
 
-#: ../rpm.c:186
+#: ../rpm.c:185
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:187
+#: ../rpm.c:186
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:188
+#: ../rpm.c:187
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: ../rpm.c:189
+#: ../rpm.c:188
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:190
+#: ../rpm.c:189
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:191
+#: ../rpm.c:190
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: ../rpm.c:192
+#: ../rpm.c:191
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:193 ../rpm.c:202 ../rpm.c:211
+#: ../rpm.c:192 ../rpm.c:201 ../rpm.c:210
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: ../rpm.c:194 ../rpm.c:204
+#: ../rpm.c:193 ../rpm.c:203
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: ../rpm.c:195
+#: ../rpm.c:194
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: ../rpm.c:196
+#: ../rpm.c:195
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:197
+#: ../rpm.c:196
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:198
+#: ../rpm.c:197
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:199
+#: ../rpm.c:198
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:200
+#: ../rpm.c:199
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: ../rpm.c:201
+#: ../rpm.c:200
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: ../rpm.c:203
+#: ../rpm.c:202
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:205
+#: ../rpm.c:204
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: ../rpm.c:206
+#: ../rpm.c:205
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:207
+#: ../rpm.c:206
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: ../rpm.c:208
+#: ../rpm.c:207
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:209
+#: ../rpm.c:208
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: ../rpm.c:210
+#: ../rpm.c:209
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: ../rpm.c:212
+#: ../rpm.c:211
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: ../rpm.c:213
+#: ../rpm.c:212
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: ../rpm.c:214
+#: ../rpm.c:213
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:215
+#: ../rpm.c:214
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:216
+#: ../rpm.c:215
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: ../rpm.c:217
+#: ../rpm.c:216
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:218
+#: ../rpm.c:217
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:219
+#: ../rpm.c:218
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:220
+#: ../rpm.c:219
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: ../rpm.c:221
+#: ../rpm.c:220
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:222
+#: ../rpm.c:221
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: ../rpm.c:223
+#: ../rpm.c:222
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: ../rpm.c:224
+#: ../rpm.c:223
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: ../rpm.c:225
+#: ../rpm.c:224
 msgid "                        [--rmsource] specfile"
 msgstr ""
 
-#: ../rpm.c:226
+#: ../rpm.c:225
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: ../rpm.c:227
+#: ../rpm.c:226
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:228
+#: ../rpm.c:227
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:229
+#: ../rpm.c:228
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:230
+#: ../rpm.c:229
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:231
+#: ../rpm.c:230
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:232
+#: ../rpm.c:231
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:233
+#: ../rpm.c:232
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:234
+#: ../rpm.c:233
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: ../rpm.c:268
+#: ../rpm.c:267
 msgid "usage:"
 msgstr ""
 
-#: ../rpm.c:270
+#: ../rpm.c:269
 msgid "print this message"
 msgstr ""
 
-#: ../rpm.c:272
+#: ../rpm.c:271
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: ../rpm.c:273
+#: ../rpm.c:272
 msgid "   all modes support the following arguments:"
 msgstr ""
 
-#: ../rpm.c:274
+#: ../rpm.c:273
 msgid "      --rcfile <file>     "
 msgstr ""
 
-#: ../rpm.c:275
+#: ../rpm.c:274
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: ../rpm.c:277
+#: ../rpm.c:276
 msgid "be a little more verbose"
 msgstr ""
 
-#: ../rpm.c:279
+#: ../rpm.c:278
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: ../rpm.c:281
+#: ../rpm.c:280
 msgid "query mode"
 msgstr ""
 
-#: ../rpm.c:282 ../rpm.c:344 ../rpm.c:408 ../rpm.c:436
+#: ../rpm.c:281 ../rpm.c:343 ../rpm.c:407 ../rpm.c:435
 msgid "      --root <dir>        "
 msgstr ""
 
-#: ../rpm.c:283 ../rpm.c:345 ../rpm.c:409 ../rpm.c:437 ../rpm.c:499
+#: ../rpm.c:282 ../rpm.c:344 ../rpm.c:408 ../rpm.c:436 ../rpm.c:498
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: ../rpm.c:284 ../rpm.c:342 ../rpm.c:372 ../rpm.c:424 ../rpm.c:496
+#: ../rpm.c:283 ../rpm.c:341 ../rpm.c:371 ../rpm.c:423 ../rpm.c:495
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: ../rpm.c:285 ../rpm.c:343 ../rpm.c:373 ../rpm.c:425 ../rpm.c:497
+#: ../rpm.c:284 ../rpm.c:342 ../rpm.c:372 ../rpm.c:424 ../rpm.c:496
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: ../rpm.c:286
+#: ../rpm.c:285
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: ../rpm.c:287
+#: ../rpm.c:286
 msgid "use <qfmt> as the header format (implies -i)"
 msgstr ""
 
-#: ../rpm.c:288
+#: ../rpm.c:287
 msgid ""
 "   install, upgrade and query (with -p) allow ftp URL's to be used in place"
 msgstr ""
 
-#: ../rpm.c:289
+#: ../rpm.c:288
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: ../rpm.c:290
+#: ../rpm.c:289
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:291
+#: ../rpm.c:290
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: ../rpm.c:292
+#: ../rpm.c:291
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: ../rpm.c:293
+#: ../rpm.c:292
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:294
+#: ../rpm.c:293
 msgid "      --httpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:295
+#: ../rpm.c:294
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: ../rpm.c:296
+#: ../rpm.c:295
 msgid "      --httpport <port>    "
 msgstr ""
 
-#: ../rpm.c:297
+#: ../rpm.c:296
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:298
+#: ../rpm.c:297
 msgid "      Package specification options:"
 msgstr ""
 
-#: ../rpm.c:300
+#: ../rpm.c:299
 msgid "query all packages"
 msgstr ""
 
-#: ../rpm.c:301
+#: ../rpm.c:300
 msgid "        -f <file>+        "
 msgstr ""
 
-#: ../rpm.c:302
+#: ../rpm.c:301
 msgid "query package owning <file>"
 msgstr ""
 
-#: ../rpm.c:303
+#: ../rpm.c:302
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: ../rpm.c:304
+#: ../rpm.c:303
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: ../rpm.c:305
+#: ../rpm.c:304
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: ../rpm.c:306
+#: ../rpm.c:305
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: ../rpm.c:307
+#: ../rpm.c:306
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: ../rpm.c:308
+#: ../rpm.c:307
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: ../rpm.c:309
+#: ../rpm.c:308
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: ../rpm.c:310
+#: ../rpm.c:309
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: ../rpm.c:311
+#: ../rpm.c:310
 msgid "      Information selection options:"
 msgstr ""
 
-#: ../rpm.c:313
+#: ../rpm.c:312
 msgid "display package information"
 msgstr ""
 
-#: ../rpm.c:315
+#: ../rpm.c:314
 msgid "display the package's change log"
 msgstr ""
 
-#: ../rpm.c:317
+#: ../rpm.c:316
 msgid "display package file list"
 msgstr ""
 
-#: ../rpm.c:319
+#: ../rpm.c:318
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: ../rpm.c:321
+#: ../rpm.c:320
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:323
+#: ../rpm.c:322
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:325
+#: ../rpm.c:324
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: ../rpm.c:327
+#: ../rpm.c:326
 msgid "list capabilities package provides"
 msgstr ""
 
-#: ../rpm.c:328
+#: ../rpm.c:327
 msgid "        --requires"
 msgstr ""
 
-#: ../rpm.c:330
+#: ../rpm.c:329
 msgid "list package dependencies"
 msgstr ""
 
-#: ../rpm.c:332
+#: ../rpm.c:331
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: ../rpm.c:334
+#: ../rpm.c:333
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: ../rpm.c:338
+#: ../rpm.c:337
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: ../rpm.c:339
+#: ../rpm.c:338
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: ../rpm.c:341
+#: ../rpm.c:340
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: ../rpm.c:347 ../rpm.c:395 ../rpm.c:429
+#: ../rpm.c:346 ../rpm.c:394 ../rpm.c:428
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: ../rpm.c:349
+#: ../rpm.c:348
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: ../rpm.c:351
+#: ../rpm.c:350
 msgid "do not verify file attributes"
 msgstr ""
 
-#: ../rpm.c:354
+#: ../rpm.c:353
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:357
+#: ../rpm.c:356
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:361
+#: ../rpm.c:360
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: ../rpm.c:362
+#: ../rpm.c:361
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:363
+#: ../rpm.c:362
 msgid "install package"
 msgstr ""
 
-#: ../rpm.c:364
+#: ../rpm.c:363
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: ../rpm.c:365
+#: ../rpm.c:364
 msgid "skip files in path <path>"
 msgstr ""
 
-#: ../rpm.c:366
+#: ../rpm.c:365
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: ../rpm.c:367
+#: ../rpm.c:366
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: ../rpm.c:369
+#: ../rpm.c:368
 msgid "relocate files even though the package doesn't allow it"
 msgstr ""
 
-#: ../rpm.c:370
+#: ../rpm.c:369
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: ../rpm.c:371
+#: ../rpm.c:370
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: ../rpm.c:375
+#: ../rpm.c:374
 msgid "do not install documentation"
 msgstr ""
 
-#: ../rpm.c:377
+#: ../rpm.c:376
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: ../rpm.c:380
+#: ../rpm.c:379
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: ../rpm.c:382
+#: ../rpm.c:381
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: ../rpm.c:385
+#: ../rpm.c:384
 msgid "don't verify package architecture"
 msgstr ""
 
-#: ../rpm.c:387
+#: ../rpm.c:386
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: ../rpm.c:389
+#: ../rpm.c:388
 msgid "don't verify package operating system"
 msgstr ""
 
-#: ../rpm.c:391
+#: ../rpm.c:390
 msgid "install documentation"
 msgstr ""
 
-#: ../rpm.c:393 ../rpm.c:427
+#: ../rpm.c:392 ../rpm.c:426
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: ../rpm.c:397 ../rpm.c:431
+#: ../rpm.c:396 ../rpm.c:430
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: ../rpm.c:399
+#: ../rpm.c:398
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: ../rpm.c:401 ../rpm.c:435
+#: ../rpm.c:400 ../rpm.c:434
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: ../rpm.c:403
+#: ../rpm.c:402
 msgid "print percentages as package installs"
 msgstr ""
 
-#: ../rpm.c:405
+#: ../rpm.c:404
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: ../rpm.c:407
+#: ../rpm.c:406
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: ../rpm.c:411
+#: ../rpm.c:410
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: ../rpm.c:413
+#: ../rpm.c:412
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: ../rpm.c:414
+#: ../rpm.c:413
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:415
+#: ../rpm.c:414
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: ../rpm.c:417
+#: ../rpm.c:416
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: ../rpm.c:419
+#: ../rpm.c:418
 msgid "    --erase <package>"
 msgstr ""
 
-#: ../rpm.c:421
+#: ../rpm.c:420
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: ../rpm.c:423
+#: ../rpm.c:422
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: ../rpm.c:433
+#: ../rpm.c:432
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: ../rpm.c:439
+#: ../rpm.c:438
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: ../rpm.c:440
+#: ../rpm.c:439
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: ../rpm.c:441
+#: ../rpm.c:440
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: ../rpm.c:443
+#: ../rpm.c:442
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: ../rpm.c:445
+#: ../rpm.c:444
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: ../rpm.c:447
+#: ../rpm.c:446
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: ../rpm.c:449
+#: ../rpm.c:448
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: ../rpm.c:451
+#: ../rpm.c:450
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:453
+#: ../rpm.c:452
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:459
+#: ../rpm.c:458
 msgid "remove sources and spec file when done"
 msgstr ""
 
-#: ../rpm.c:461
+#: ../rpm.c:460
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: ../rpm.c:462
+#: ../rpm.c:461
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: ../rpm.c:463
+#: ../rpm.c:462
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: ../rpm.c:464
+#: ../rpm.c:463
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: ../rpm.c:465
+#: ../rpm.c:464
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: ../rpm.c:467
+#: ../rpm.c:466
 msgid "do not execute any stages"
 msgstr ""
 
-#: ../rpm.c:468
+#: ../rpm.c:467
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: ../rpm.c:469
+#: ../rpm.c:468
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: ../rpm.c:471
+#: ../rpm.c:470
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: ../rpm.c:472
+#: ../rpm.c:471
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: ../rpm.c:473
+#: ../rpm.c:472
 msgid "    --rmsource <spec>     "
 msgstr ""
 
-#: ../rpm.c:474
+#: ../rpm.c:473
 msgid "remove sources and spec file"
 msgstr ""
 
-#: ../rpm.c:475
+#: ../rpm.c:474
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: ../rpm.c:476
+#: ../rpm.c:475
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: ../rpm.c:477
+#: ../rpm.c:476
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: ../rpm.c:478
+#: ../rpm.c:477
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: ../rpm.c:479
+#: ../rpm.c:478
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: ../rpm.c:480
+#: ../rpm.c:479
 msgid "add a signature to a package"
 msgstr ""
 
-#: ../rpm.c:482
+#: ../rpm.c:481
 msgid "    --checksig <pkg>+     "
 msgstr ""
 
-#: ../rpm.c:483
+#: ../rpm.c:482
 msgid "verify package signature"
 msgstr ""
 
-#: ../rpm.c:485
+#: ../rpm.c:484
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: ../rpm.c:487
+#: ../rpm.c:486
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: ../rpm.c:489
+#: ../rpm.c:488
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: ../rpm.c:491
+#: ../rpm.c:490
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: ../rpm.c:493
+#: ../rpm.c:492
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: ../rpm.c:495
+#: ../rpm.c:494
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: ../rpm.c:634 ../rpm.c:640 ../rpm.c:647 ../rpm.c:653 ../rpm.c:662
-#: ../rpm.c:669 ../rpm.c:716 ../rpm.c:722 ../rpm.c:756 ../rpm.c:762
-#: ../rpm.c:768 ../rpm.c:776 ../rpm.c:811 ../rpm.c:866 ../rpm.c:873
+#: ../rpm.c:633 ../rpm.c:639 ../rpm.c:646 ../rpm.c:652 ../rpm.c:661
+#: ../rpm.c:668 ../rpm.c:715 ../rpm.c:721 ../rpm.c:755 ../rpm.c:761
+#: ../rpm.c:767 ../rpm.c:775 ../rpm.c:810 ../rpm.c:865 ../rpm.c:872
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: ../rpm.c:655
+#: ../rpm.c:654
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: ../rpm.c:657
+#: ../rpm.c:656
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: ../rpm.c:673
+#: ../rpm.c:672
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:677
+#: ../rpm.c:676
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:729 ../rpm.c:735 ../rpm.c:742 ../rpm.c:749 ../rpm.c:880
+#: ../rpm.c:728 ../rpm.c:734 ../rpm.c:741 ../rpm.c:748 ../rpm.c:879
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: ../rpm.c:784
+#: ../rpm.c:783
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: ../rpm.c:817
+#: ../rpm.c:816
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: ../rpm.c:819
+#: ../rpm.c:818
 msgid "relocations must contain a ="
 msgstr ""
 
-#: ../rpm.c:822
+#: ../rpm.c:821
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: ../rpm.c:831
+#: ../rpm.c:830
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: ../rpm.c:840
+#: ../rpm.c:839
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: ../rpm.c:893
+#: ../rpm.c:892
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: ../rpm.c:898
+#: ../rpm.c:897
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: ../rpm.c:901
+#: ../rpm.c:900
 msgid "unexpected query flags"
 msgstr ""
 
-#: ../rpm.c:904
+#: ../rpm.c:903
 msgid "unexpected query format"
 msgstr ""
 
-#: ../rpm.c:908
+#: ../rpm.c:907
 msgid "unexpected query source"
 msgstr ""
 
-#: ../rpm.c:914
+#: ../rpm.c:913
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: ../rpm.c:917
+#: ../rpm.c:916
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: ../rpm.c:920
+#: ../rpm.c:919
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: ../rpm.c:923
+#: ../rpm.c:922
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:926
+#: ../rpm.c:925
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:929
+#: ../rpm.c:928
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: ../rpm.c:932
+#: ../rpm.c:931
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:936
+#: ../rpm.c:935
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:940
+#: ../rpm.c:939
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:944
+#: ../rpm.c:943
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:948
+#: ../rpm.c:947
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:952
+#: ../rpm.c:951
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:956
+#: ../rpm.c:955
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: ../rpm.c:960
+#: ../rpm.c:959
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:964
+#: ../rpm.c:963
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:968
+#: ../rpm.c:967
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:972
+#: ../rpm.c:971
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: ../rpm.c:976
+#: ../rpm.c:975
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:980
+#: ../rpm.c:979
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: ../rpm.c:985
+#: ../rpm.c:984
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:989
+#: ../rpm.c:988
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:995
+#: ../rpm.c:994
 msgid ""
 "--nodeps may only be specified during package building, installation, "
 "erasure, and verification"
 msgstr ""
 
-#: ../rpm.c:1000
+#: ../rpm.c:999
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: ../rpm.c:1005
+#: ../rpm.c:1004
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: ../rpm.c:1010
+#: ../rpm.c:1009
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: ../rpm.c:1013
+#: ../rpm.c:1012
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: ../rpm.c:1018
+#: ../rpm.c:1017
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1024
+#: ../rpm.c:1023
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1028
+#: ../rpm.c:1027
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1031
+#: ../rpm.c:1030
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1034
+#: ../rpm.c:1033
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: ../rpm.c:1060
+#: ../rpm.c:1059
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1077
+#: ../rpm.c:1076
 msgid "pgp not found: "
 msgstr ""
 
-#: ../rpm.c:1080
+#: ../rpm.c:1079
 msgid "Use `%%_signature pgp5' instead of `%%_signature pgp' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1087
+#: ../rpm.c:1086
 msgid "pgp version 5 not found: "
 msgstr ""
 
-#: ../rpm.c:1090
+#: ../rpm.c:1089
 msgid "Use `%%_signature pgp' instead of `%%_signature pgp5' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1096
+#: ../rpm.c:1095
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: ../rpm.c:1097
+#: ../rpm.c:1096
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1100
+#: ../rpm.c:1099
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1107
+#: ../rpm.c:1106
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1112
+#: ../rpm.c:1111
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1129
+#: ../rpm.c:1128
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1148
+#: ../rpm.c:1147
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1159
+#: ../rpm.c:1158
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1171
+#: ../rpm.c:1170
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1184
+#: ../rpm.c:1183
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1241
+#: ../rpm.c:1240
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1243
+#: ../rpm.c:1242
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1255
+#: ../rpm.c:1254
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1304
+#: ../rpm.c:1303
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1327
+#: ../rpm.c:1326
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1332
+#: ../rpm.c:1331
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1349
+#: ../rpm.c:1348
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: ../rpm.c:1353
+#: ../rpm.c:1352
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1229,7 +1228,7 @@ msgstr ""
 msgid "error reading header from package\n"
 msgstr ""
 
-#: ../build/build.c:83 ../build/pack.c:248
+#: ../build/build.c:83 ../build/pack.c:240
 msgid "Unable to open temp file"
 msgstr ""
 
@@ -1406,7 +1405,7 @@ msgstr ""
 msgid "Could not open %%files file: %s"
 msgstr ""
 
-#: ../build/files.c:1150 ../build/pack.c:433
+#: ../build/files.c:1150 ../build/pack.c:425
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1464,101 +1463,101 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: ../build/pack.c:134
+#: ../build/pack.c:127
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: ../build/pack.c:167
+#: ../build/pack.c:160
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: ../build/pack.c:177
+#: ../build/pack.c:170
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: ../build/pack.c:197
+#: ../build/pack.c:190
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: ../build/pack.c:203
+#: ../build/pack.c:196
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: ../build/pack.c:259
+#: ../build/pack.c:251
 msgid "Bad CSA data"
 msgstr ""
 
-#: ../build/pack.c:282
+#: ../build/pack.c:274
 #, c-format
 msgid "Could not open %s\n"
 msgstr ""
 
-#: ../build/pack.c:314 ../build/pack.c:357
+#: ../build/pack.c:306 ../build/pack.c:349
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: ../build/pack.c:330 ../lib/rpmchecksig.c:94
+#: ../build/pack.c:322 ../lib/rpmchecksig.c:94
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: ../build/pack.c:347
+#: ../build/pack.c:339
 #, c-format
 msgid "Unable to read sigtarget: %s"
 msgstr ""
 
-#: ../build/pack.c:372
+#: ../build/pack.c:364
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: ../build/pack.c:387
+#: ../build/pack.c:379
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: ../build/pack.c:403
+#: ../build/pack.c:395
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: ../build/pack.c:410
+#: ../build/pack.c:402
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: ../build/pack.c:489
+#: ../build/pack.c:481
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: ../build/pack.c:496
+#: ../build/pack.c:488
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: ../build/pack.c:503
+#: ../build/pack.c:495
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: ../build/pack.c:510
+#: ../build/pack.c:502
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: ../build/pack.c:518
+#: ../build/pack.c:510
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: ../build/pack.c:534
+#: ../build/pack.c:526
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
@@ -1977,38 +1976,43 @@ msgstr ""
 msgid "error removing record %s into %s"
 msgstr ""
 
-#: ../lib/depends.c:552
+#: ../lib/depends.c:554
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: ../lib/depends.c:594
+#: ../lib/depends.c:596
 #, c-format
 msgid "dependencies: looking for %s\n"
 msgstr ""
 
-#: ../lib/depends.c:719
+#: ../lib/depends.c:721
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr ""
 
-#: ../lib/depends.c:758
+#: ../lib/depends.c:760
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: ../lib/depends.c:811 ../lib/depends.c:1114
+#: ../lib/depends.c:813 ../lib/depends.c:1116
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr ""
 
-#: ../lib/depends.c:903
+#: ../lib/depends.c:905
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
 #: ../lib/falloc.c:149
 #, c-format
-msgid "free list corrupt (%u)- contact rpm-list@redhat.com\n"
+msgid ""
+"free list corrupt (%u)- please run\n"
+"\t\"rpm --rebuilddb\"\n"
+"More information is available from http://www.rpm.org or the "
+"rpm-list@redhat.com mailing list\n"
+"if \"rpm --rebuilddb\" fails to correct the problem.\n"
 msgstr ""
 
 #: ../lib/formats.c:65 ../lib/formats.c:83 ../lib/formats.c:104
@@ -2170,7 +2174,7 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: ../lib/install.c:118 ../lib/uninstall.c:160
+#: ../lib/install.c:118 ../lib/uninstall.c:159
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2233,7 +2237,7 @@ msgstr ""
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: ../lib/install.c:513 ../lib/install.c:802 ../lib/uninstall.c:26
+#: ../lib/install.c:513 ../lib/install.c:800 ../lib/uninstall.c:26
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
@@ -2242,30 +2246,30 @@ msgstr ""
 msgid "source package expected, binary found"
 msgstr ""
 
-#: ../lib/install.c:664
+#: ../lib/install.c:662
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: ../lib/install.c:727
+#: ../lib/install.c:725
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: ../lib/install.c:732
+#: ../lib/install.c:730
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: ../lib/install.c:762
+#: ../lib/install.c:760
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: ../lib/install.c:798
+#: ../lib/install.c:796
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: ../lib/install.c:882
+#: ../lib/install.c:880
 msgid "running postinstall script (if any)\n"
 msgstr ""
 
@@ -2413,48 +2417,48 @@ msgstr ""
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: ../lib/problems.c:70
+#: ../lib/problems.c:63
 #, c-format
 msgid "package %s-%s-%s is for a different architecture"
 msgstr ""
 
-#: ../lib/problems.c:75
+#: ../lib/problems.c:68
 #, c-format
 msgid "package %s-%s-%s is for a different operating system"
 msgstr ""
 
-#: ../lib/problems.c:80
+#: ../lib/problems.c:73
 #, c-format
 msgid "package %s-%s-%s is already installed"
 msgstr ""
 
-#: ../lib/problems.c:85
+#: ../lib/problems.c:78
 #, c-format
 msgid "path %s is not relocateable for package %s-%s-%s"
 msgstr ""
 
-#: ../lib/problems.c:90
+#: ../lib/problems.c:83
 #, c-format
 msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
 msgstr ""
 
-#: ../lib/problems.c:96
+#: ../lib/problems.c:89
 #, c-format
 msgid ""
 "file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
 msgstr ""
 
-#: ../lib/problems.c:102
+#: ../lib/problems.c:95
 #, c-format
 msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
 msgstr ""
 
-#: ../lib/problems.c:108
+#: ../lib/problems.c:101
 #, c-format
 msgid "installing package %s-%s-%s needs %ld%c on the %s filesystem"
 msgstr ""
 
-#: ../lib/problems.c:120
+#: ../lib/problems.c:113
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s-%s-%s"
 msgstr ""
@@ -2464,192 +2468,192 @@ msgstr ""
 msgid "error in format: %s\n"
 msgstr ""
 
-#: ../lib/query.c:181
+#: ../lib/query.c:179
 msgid "(contains no files)"
 msgstr ""
 
-#: ../lib/query.c:234
+#: ../lib/query.c:232
 msgid "normal        "
 msgstr ""
 
-#: ../lib/query.c:236
+#: ../lib/query.c:234
 msgid "replaced      "
 msgstr ""
 
-#: ../lib/query.c:238
+#: ../lib/query.c:236
 msgid "net shared    "
 msgstr ""
 
-#: ../lib/query.c:240
+#: ../lib/query.c:238
 msgid "not installed "
 msgstr ""
 
-#: ../lib/query.c:242
+#: ../lib/query.c:240
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: ../lib/query.c:246
+#: ../lib/query.c:244
 msgid "(no state)    "
 msgstr ""
 
-#: ../lib/query.c:262 ../lib/query.c:292
+#: ../lib/query.c:260 ../lib/query.c:290
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: ../lib/query.c:397
+#: ../lib/query.c:395
 #, c-format
 msgid "record number %u\n"
 msgstr ""
 
-#: ../lib/query.c:401
+#: ../lib/query.c:399
 msgid "error: could not read database record\n"
 msgstr ""
 
-#: ../lib/query.c:439
+#: ../lib/query.c:437
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: ../lib/query.c:452
+#: ../lib/query.c:450
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: ../lib/query.c:461 ../lib/rpminstall.c:204
+#: ../lib/query.c:459 ../lib/rpminstall.c:204
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: ../lib/query.c:464
+#: ../lib/query.c:462
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: ../lib/query.c:491
+#: ../lib/query.c:489
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: ../lib/query.c:516
+#: ../lib/query.c:514
 msgid "could not read database record!\n"
 msgstr ""
 
-#: ../lib/query.c:527
+#: ../lib/query.c:525
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: ../lib/query.c:537
+#: ../lib/query.c:535
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: ../lib/query.c:547
+#: ../lib/query.c:545
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: ../lib/query.c:557
+#: ../lib/query.c:555
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: ../lib/query.c:572
+#: ../lib/query.c:570
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: ../lib/query.c:575
+#: ../lib/query.c:573
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: ../lib/query.c:588
+#: ../lib/query.c:586
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: ../lib/query.c:591
+#: ../lib/query.c:589
 #, c-format
 msgid "package record number: %d\n"
 msgstr ""
 
-#: ../lib/query.c:594
+#: ../lib/query.c:592
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: ../lib/query.c:606 ../lib/rpminstall.c:385
+#: ../lib/query.c:604 ../lib/rpminstall.c:385
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: ../lib/query.c:609
+#: ../lib/query.c:607
 #, c-format
 msgid "error looking for package %s\n"
 msgstr ""
 
-#: ../lib/query.c:631
+#: ../lib/query.c:629
 msgid "rpmQuery: rpmdbOpen() failed\n"
 msgstr ""
 
-#: ../lib/query.c:688
+#: ../lib/query.c:686
 msgid "query package owning file"
 msgstr ""
 
-#: ../lib/query.c:690
+#: ../lib/query.c:688
 msgid "query packages in group"
 msgstr ""
 
-#: ../lib/query.c:692
+#: ../lib/query.c:690
 msgid "query a package file"
 msgstr ""
 
-#: ../lib/query.c:696
+#: ../lib/query.c:694
 msgid "query a spec file"
 msgstr ""
 
-#: ../lib/query.c:698
+#: ../lib/query.c:696
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: ../lib/query.c:700
+#: ../lib/query.c:698
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: ../lib/query.c:702
+#: ../lib/query.c:700
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: ../lib/query.c:739
+#: ../lib/query.c:737
 msgid "list all configuration files"
 msgstr ""
 
-#: ../lib/query.c:741
+#: ../lib/query.c:739
 msgid "list all documentation files"
 msgstr ""
 
-#: ../lib/query.c:743
+#: ../lib/query.c:741
 msgid "dump basic file information"
 msgstr ""
 
-#: ../lib/query.c:745
+#: ../lib/query.c:743
 msgid "list files in package"
 msgstr ""
 
-#: ../lib/query.c:749
+#: ../lib/query.c:747
 msgid "use the following query format"
 msgstr ""
 
-#: ../lib/query.c:751
+#: ../lib/query.c:749
 msgid "substitute i18n sections from the following catalogue"
 msgstr ""
 
-#: ../lib/query.c:754
+#: ../lib/query.c:752
 msgid "display the states of the listed files"
 msgstr ""
 
-#: ../lib/query.c:756
+#: ../lib/query.c:754
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3208,17 +3212,17 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: ../lib/transaction.c:345
+#: ../lib/transaction.c:350
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:351
+#: ../lib/transaction.c:356
 #, c-format
 msgid "excluding %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:464
+#: ../lib/transaction.c:469
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3238,25 +3242,25 @@ msgstr ""
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: ../lib/uninstall.c:100
+#: ../lib/uninstall.c:99
 #, c-format
 msgid "cannot read packages named %s for uninstall"
 msgstr ""
 
-#: ../lib/uninstall.c:128
+#: ../lib/uninstall.c:127
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: ../lib/uninstall.c:173
+#: ../lib/uninstall.c:172
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: ../lib/uninstall.c:187
+#: ../lib/uninstall.c:186
 msgid "removing database entry\n"
 msgstr ""
 
-#: ../lib/uninstall.c:339
+#: ../lib/uninstall.c:338
 msgid "execution of script failed"
 msgstr ""
 
@@ -3302,11 +3306,11 @@ msgstr ""
 msgid "missing    %s\n"
 msgstr ""
 
-#: ../lib/verify.c:321
+#: ../lib/verify.c:319
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: ../lib/verify.c:369
+#: ../lib/verify.c:367
 msgid "rpmVerify: rpmdbOpen() failed\n"
 msgstr ""