fix: --rebuilddb with --root dinna remove directory (Michael Andres).

CVS patchset: 3097
CVS date: 1999/06/17 22:29:22

diff --git a/CHANGES b/CHANGES
index 5237b18..12a0bb7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@
        - eliminate find-requirements on libNoVersion (Red Hat linux only).
        - add new-fangled requires on "libc.so.6(GLIBC_2.1)" (sparc-linux only).
        - MiNT port (Guido Flohr <gufl0000@stud.uni-sb.de>).
+       - fix: --rebuilddb with --root dinna remove directory (Michael Andres).
 
 3.0 -> 3.0.1
        - fix: %verifyscript resurrected (Shing-Gene Yung).

diff --git a/lib/rebuilddb.c b/lib/rebuilddb.c
index 6af2bd6..15b5e89 100644 (file)
--- a/lib/rebuilddb.c
+++ b/lib/rebuilddb.c
@@ -9,6 +9,7 @@ int rpmdbRebuild(const char * rootdir) {
     rpmdb olddb, newdb;
     const char * dbpath = NULL;
     const char * newdbpath = NULL;
+    const char * newrootdbpath = NULL;
     int recnum; 
     Header h;
     int failed = 0;
@@ -24,23 +25,20 @@ int rpmdbRebuild(const char * rootdir) {
     }
 
     sprintf(tfn, "rebuilddb.%d", (int) getpid());
-    newdbpath = rpmGetPath(rootdir, dbpath, tfn, NULL);
+    newrootdbpath = rpmGetPath(rootdir, dbpath, tfn, NULL);
+    newdbpath = newrootdbpath + strlen(rootdir);
 
-    if (!access(newdbpath, F_OK)) {
+    if (!access(newrootdbpath, F_OK)) {
        rpmError(RPMERR_MKDIR, _("temporary database %s already exists"),
-             newdbpath);
+             newrootdbpath);
     }
 
-    rpmMessage(RPMMESS_DEBUG, _("creating directory: %s\n"), newdbpath);
-    if (mkdir(newdbpath, 0755)) {
+    rpmMessage(RPMMESS_DEBUG, _("creating directory: %s\n"), newrootdbpath);
+    if (mkdir(newrootdbpath, 0755)) {
        rpmError(RPMERR_MKDIR, _("error creating directory %s: %s"),
-             newdbpath, strerror(errno));
+             newrootdbpath, strerror(errno));
     }
 
-    /* XXX WTFO? */
-    xfree(newdbpath);
-    newdbpath = rpmGetPath(dbpath, tfn, NULL);
-
     rpmMessage(RPMMESS_DEBUG, _("opening old database\n"));
     if (openDatabase(rootdir, dbpath, &olddb, O_RDONLY, 0644, 
                     RPMDB_FLAG_MINIMAL)) {
@@ -104,15 +102,15 @@ int rpmdbRebuild(const char * rootdir) {
            rc = 1;
            goto exit;
        }
-       if (rmdir(newdbpath))
+       if (rmdir(newrootdbpath))
            rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
-                       newdbpath, strerror(errno));
+                       newrootdbpath, strerror(errno));
     }
     rc = 0;
 
 exit:
     if (dbpath)                xfree(dbpath);
-    if (newdbpath)     xfree(newdbpath);
+    if (newrootdbpath) xfree(newrootdbpath);
 
     return rc;
 }

diff --git a/po/rpm.pot b/po/rpm.pot
index 8dd11d0..9a89068 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-06-17 11:17-0400\n"
+"POT-Creation-Date: 1999-06-17 18:27-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:323 ../rpm.c:457
+#: ../build.c:323 ../rpm.c:462
 msgid "remove build tree when done"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "remove specfile when done"
 msgstr ""
 
-#: ../build.c:333 ../rpm.c:455
+#: ../build.c:333 ../rpm.c:460
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -235,55 +235,55 @@ msgstr ""
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
-#: ../ftp.c:642
+#: ../ftp.c:651
 msgid "Success"
 msgstr ""
 
-#: ../ftp.c:645
+#: ../ftp.c:654
 msgid "Bad server response"
 msgstr ""
 
-#: ../ftp.c:648
+#: ../ftp.c:657
 msgid "Server IO error"
 msgstr ""
 
-#: ../ftp.c:651
+#: ../ftp.c:660
 msgid "Server timeout"
 msgstr ""
 
-#: ../ftp.c:654
+#: ../ftp.c:663
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: ../ftp.c:657
+#: ../ftp.c:666
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: ../ftp.c:660
+#: ../ftp.c:669
 msgid "Failed to connect to server"
 msgstr ""
 
-#: ../ftp.c:663
+#: ../ftp.c:672
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: ../ftp.c:666
+#: ../ftp.c:675
 msgid "IO error to local file"
 msgstr ""
 
-#: ../ftp.c:669
+#: ../ftp.c:678
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: ../ftp.c:672
+#: ../ftp.c:681
 msgid "File not found on server"
 msgstr ""
 
-#: ../ftp.c:675
+#: ../ftp.c:684
 msgid "Abort in progress"
 msgstr ""
 
-#: ../ftp.c:679
+#: ../ftp.c:688
 msgid "Unknown or unexpected error"
 msgstr ""
 
@@ -405,1083 +405,1083 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: ../rpm.c:159
+#: ../rpm.c:164
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: ../rpm.c:170
+#: ../rpm.c:175
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: ../rpm.c:174
+#: ../rpm.c:179
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: ../rpm.c:175
+#: ../rpm.c:180
 msgid ""
 "This may be freely redistributed under the terms of the GNU Public License"
 msgstr ""
 
-#: ../rpm.c:184
+#: ../rpm.c:189
 msgid "usage: rpm {--help}"
 msgstr ""
 
-#: ../rpm.c:185
+#: ../rpm.c:190
 msgid "       rpm {--version}"
 msgstr ""
 
-#: ../rpm.c:186
+#: ../rpm.c:191
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:187
+#: ../rpm.c:192
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:188
+#: ../rpm.c:193
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: ../rpm.c:189
+#: ../rpm.c:194
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:190
+#: ../rpm.c:195
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:191
+#: ../rpm.c:196
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: ../rpm.c:192
+#: ../rpm.c:197
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:193 ../rpm.c:202 ../rpm.c:211
+#: ../rpm.c:198 ../rpm.c:207 ../rpm.c:216
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: ../rpm.c:194 ../rpm.c:204
+#: ../rpm.c:199 ../rpm.c:209
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: ../rpm.c:195
+#: ../rpm.c:200
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: ../rpm.c:196
+#: ../rpm.c:201
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:197
+#: ../rpm.c:202
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:198
+#: ../rpm.c:203
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:199
+#: ../rpm.c:204
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:200
+#: ../rpm.c:205
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: ../rpm.c:201
+#: ../rpm.c:206
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: ../rpm.c:203
+#: ../rpm.c:208
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:205
+#: ../rpm.c:210
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: ../rpm.c:206
+#: ../rpm.c:211
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:207
+#: ../rpm.c:212
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: ../rpm.c:208
+#: ../rpm.c:213
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:209
+#: ../rpm.c:214
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: ../rpm.c:210
+#: ../rpm.c:215
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: ../rpm.c:212
+#: ../rpm.c:217
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: ../rpm.c:213
+#: ../rpm.c:218
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: ../rpm.c:214
+#: ../rpm.c:219
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:215
+#: ../rpm.c:220
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:216
+#: ../rpm.c:221
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: ../rpm.c:217
+#: ../rpm.c:222
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:218
+#: ../rpm.c:223
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:219
+#: ../rpm.c:224
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:220
+#: ../rpm.c:225
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: ../rpm.c:221
+#: ../rpm.c:226
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:222
+#: ../rpm.c:227
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: ../rpm.c:223
+#: ../rpm.c:228
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: ../rpm.c:224
+#: ../rpm.c:229
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: ../rpm.c:225
+#: ../rpm.c:230
 msgid "                        [--rmsource] specfile"
 msgstr ""
 
-#: ../rpm.c:226
+#: ../rpm.c:231
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: ../rpm.c:227
+#: ../rpm.c:232
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:228
+#: ../rpm.c:233
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:229
+#: ../rpm.c:234
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:230
+#: ../rpm.c:235
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:231
+#: ../rpm.c:236
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:232
+#: ../rpm.c:237
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:233
+#: ../rpm.c:238
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:234
+#: ../rpm.c:239
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: ../rpm.c:268
+#: ../rpm.c:273
 msgid "usage:"
 msgstr ""
 
-#: ../rpm.c:270
+#: ../rpm.c:275
 msgid "print this message"
 msgstr ""
 
-#: ../rpm.c:272
+#: ../rpm.c:277
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: ../rpm.c:273
+#: ../rpm.c:278
 msgid "   all modes support the following arguments:"
 msgstr ""
 
-#: ../rpm.c:274
+#: ../rpm.c:279
 msgid "      --rcfile <file>     "
 msgstr ""
 
-#: ../rpm.c:275
+#: ../rpm.c:280
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: ../rpm.c:277
+#: ../rpm.c:282
 msgid "be a little more verbose"
 msgstr ""
 
-#: ../rpm.c:279
+#: ../rpm.c:284
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: ../rpm.c:281
+#: ../rpm.c:286
 msgid "query mode"
 msgstr ""
 
-#: ../rpm.c:282 ../rpm.c:344 ../rpm.c:408 ../rpm.c:436
+#: ../rpm.c:287 ../rpm.c:349 ../rpm.c:413 ../rpm.c:441
 msgid "      --root <dir>        "
 msgstr ""
 
-#: ../rpm.c:283 ../rpm.c:345 ../rpm.c:409 ../rpm.c:437 ../rpm.c:499
+#: ../rpm.c:288 ../rpm.c:350 ../rpm.c:414 ../rpm.c:442 ../rpm.c:504
 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:289 ../rpm.c:347 ../rpm.c:377 ../rpm.c:429 ../rpm.c:501
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: ../rpm.c:285 ../rpm.c:343 ../rpm.c:373 ../rpm.c:425 ../rpm.c:497
+#: ../rpm.c:290 ../rpm.c:348 ../rpm.c:378 ../rpm.c:430 ../rpm.c:502
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: ../rpm.c:286
+#: ../rpm.c:291
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: ../rpm.c:287
+#: ../rpm.c:292
 msgid "use <qfmt> as the header format (implies -i)"
 msgstr ""
 
-#: ../rpm.c:288
+#: ../rpm.c:293
 msgid ""
 "   install, upgrade and query (with -p) allow ftp URL's to be used in place"
 msgstr ""
 
-#: ../rpm.c:289
+#: ../rpm.c:294
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: ../rpm.c:290
+#: ../rpm.c:295
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:291
+#: ../rpm.c:296
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: ../rpm.c:292
+#: ../rpm.c:297
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: ../rpm.c:293
+#: ../rpm.c:298
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:294
+#: ../rpm.c:299
 msgid "      --httpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:295
+#: ../rpm.c:300
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: ../rpm.c:296
+#: ../rpm.c:301
 msgid "      --httpport <port>    "
 msgstr ""
 
-#: ../rpm.c:297
+#: ../rpm.c:302
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:298
+#: ../rpm.c:303
 msgid "      Package specification options:"
 msgstr ""
 
-#: ../rpm.c:300
+#: ../rpm.c:305
 msgid "query all packages"
 msgstr ""
 
-#: ../rpm.c:301
+#: ../rpm.c:306
 msgid "        -f <file>+        "
 msgstr ""
 
-#: ../rpm.c:302
+#: ../rpm.c:307
 msgid "query package owning <file>"
 msgstr ""
 
-#: ../rpm.c:303
+#: ../rpm.c:308
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: ../rpm.c:304
+#: ../rpm.c:309
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: ../rpm.c:305
+#: ../rpm.c:310
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: ../rpm.c:306
+#: ../rpm.c:311
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: ../rpm.c:307
+#: ../rpm.c:312
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: ../rpm.c:308
+#: ../rpm.c:313
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: ../rpm.c:309
+#: ../rpm.c:314
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: ../rpm.c:310
+#: ../rpm.c:315
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: ../rpm.c:311
+#: ../rpm.c:316
 msgid "      Information selection options:"
 msgstr ""
 
-#: ../rpm.c:313
+#: ../rpm.c:318
 msgid "display package information"
 msgstr ""
 
-#: ../rpm.c:315
+#: ../rpm.c:320
 msgid "display the package's change log"
 msgstr ""
 
-#: ../rpm.c:317
+#: ../rpm.c:322
 msgid "display package file list"
 msgstr ""
 
-#: ../rpm.c:319
+#: ../rpm.c:324
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: ../rpm.c:321
+#: ../rpm.c:326
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:323
+#: ../rpm.c:328
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:325
+#: ../rpm.c:330
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: ../rpm.c:327
+#: ../rpm.c:332
 msgid "list capabilities package provides"
 msgstr ""
 
-#: ../rpm.c:328
+#: ../rpm.c:333
 msgid "        --requires"
 msgstr ""
 
-#: ../rpm.c:330
+#: ../rpm.c:335
 msgid "list package dependencies"
 msgstr ""
 
-#: ../rpm.c:332
+#: ../rpm.c:337
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: ../rpm.c:334
+#: ../rpm.c:339
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: ../rpm.c:338
+#: ../rpm.c:343
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: ../rpm.c:339
+#: ../rpm.c:344
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: ../rpm.c:341
+#: ../rpm.c:346
 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:352 ../rpm.c:400 ../rpm.c:434
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: ../rpm.c:349
+#: ../rpm.c:354
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: ../rpm.c:351
+#: ../rpm.c:356
 msgid "do not verify file attributes"
 msgstr ""
 
-#: ../rpm.c:354
+#: ../rpm.c:359
 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:362
 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:366
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: ../rpm.c:362
+#: ../rpm.c:367
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:363
+#: ../rpm.c:368
 msgid "install package"
 msgstr ""
 
-#: ../rpm.c:364
+#: ../rpm.c:369
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: ../rpm.c:365
+#: ../rpm.c:370
 msgid "skip files in path <path>"
 msgstr ""
 
-#: ../rpm.c:366
+#: ../rpm.c:371
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: ../rpm.c:367
+#: ../rpm.c:372
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: ../rpm.c:369
+#: ../rpm.c:374
 msgid "relocate files even though the package doesn't allow it"
 msgstr ""
 
-#: ../rpm.c:370
+#: ../rpm.c:375
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: ../rpm.c:371
+#: ../rpm.c:376
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: ../rpm.c:375
+#: ../rpm.c:380
 msgid "do not install documentation"
 msgstr ""
 
-#: ../rpm.c:377
+#: ../rpm.c:382
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: ../rpm.c:380
+#: ../rpm.c:385
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: ../rpm.c:382
+#: ../rpm.c:387
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: ../rpm.c:385
+#: ../rpm.c:390
 msgid "don't verify package architecture"
 msgstr ""
 
-#: ../rpm.c:387
+#: ../rpm.c:392
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: ../rpm.c:389
+#: ../rpm.c:394
 msgid "don't verify package operating system"
 msgstr ""
 
-#: ../rpm.c:391
+#: ../rpm.c:396
 msgid "install documentation"
 msgstr ""
 
-#: ../rpm.c:393 ../rpm.c:427
+#: ../rpm.c:398 ../rpm.c:432
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: ../rpm.c:397 ../rpm.c:431
+#: ../rpm.c:402 ../rpm.c:436
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: ../rpm.c:399
+#: ../rpm.c:404
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: ../rpm.c:401 ../rpm.c:435
+#: ../rpm.c:406 ../rpm.c:440
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: ../rpm.c:403
+#: ../rpm.c:408
 msgid "print percentages as package installs"
 msgstr ""
 
-#: ../rpm.c:405
+#: ../rpm.c:410
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: ../rpm.c:407
+#: ../rpm.c:412
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: ../rpm.c:411
+#: ../rpm.c:416
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: ../rpm.c:413
+#: ../rpm.c:418
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: ../rpm.c:414
+#: ../rpm.c:419
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:415
+#: ../rpm.c:420
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: ../rpm.c:417
+#: ../rpm.c:422
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: ../rpm.c:419
+#: ../rpm.c:424
 msgid "    --erase <package>"
 msgstr ""
 
-#: ../rpm.c:421
+#: ../rpm.c:426
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: ../rpm.c:423
+#: ../rpm.c:428
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: ../rpm.c:433
+#: ../rpm.c:438
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: ../rpm.c:439
+#: ../rpm.c:444
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: ../rpm.c:440
+#: ../rpm.c:445
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: ../rpm.c:441
+#: ../rpm.c:446
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: ../rpm.c:443
+#: ../rpm.c:448
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: ../rpm.c:445
+#: ../rpm.c:450
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: ../rpm.c:447
+#: ../rpm.c:452
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: ../rpm.c:449
+#: ../rpm.c:454
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: ../rpm.c:451
+#: ../rpm.c:456
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:453
+#: ../rpm.c:458
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:459
+#: ../rpm.c:464
 msgid "remove sources and spec file when done"
 msgstr ""
 
-#: ../rpm.c:461
+#: ../rpm.c:466
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: ../rpm.c:462
+#: ../rpm.c:467
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: ../rpm.c:463
+#: ../rpm.c:468
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: ../rpm.c:464
+#: ../rpm.c:469
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: ../rpm.c:465
+#: ../rpm.c:470
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: ../rpm.c:467
+#: ../rpm.c:472
 msgid "do not execute any stages"
 msgstr ""
 
-#: ../rpm.c:468
+#: ../rpm.c:473
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: ../rpm.c:469
+#: ../rpm.c:474
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: ../rpm.c:471
+#: ../rpm.c:476
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: ../rpm.c:472
+#: ../rpm.c:477
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: ../rpm.c:473
+#: ../rpm.c:478
 msgid "    --rmsource <spec>     "
 msgstr ""
 
-#: ../rpm.c:474
+#: ../rpm.c:479
 msgid "remove sources and spec file"
 msgstr ""
 
-#: ../rpm.c:475
+#: ../rpm.c:480
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: ../rpm.c:476
+#: ../rpm.c:481
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: ../rpm.c:477
+#: ../rpm.c:482
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: ../rpm.c:478
+#: ../rpm.c:483
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: ../rpm.c:479
+#: ../rpm.c:484
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: ../rpm.c:480
+#: ../rpm.c:485
 msgid "add a signature to a package"
 msgstr ""
 
-#: ../rpm.c:482
+#: ../rpm.c:487
 msgid "    --checksig <pkg>+     "
 msgstr ""
 
-#: ../rpm.c:483
+#: ../rpm.c:488
 msgid "verify package signature"
 msgstr ""
 
-#: ../rpm.c:485
+#: ../rpm.c:490
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: ../rpm.c:487
+#: ../rpm.c:492
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: ../rpm.c:489
+#: ../rpm.c:494
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: ../rpm.c:491
+#: ../rpm.c:496
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: ../rpm.c:493
+#: ../rpm.c:498
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: ../rpm.c:495
+#: ../rpm.c:500
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: ../rpm.c:631 ../rpm.c:637 ../rpm.c:644 ../rpm.c:650 ../rpm.c:659
-#: ../rpm.c:666 ../rpm.c:713 ../rpm.c:719 ../rpm.c:779 ../rpm.c:787
-#: ../rpm.c:794 ../rpm.c:803 ../rpm.c:810 ../rpm.c:818 ../rpm.c:847
-#: ../rpm.c:902 ../rpm.c:909
+#: ../rpm.c:636 ../rpm.c:642 ../rpm.c:649 ../rpm.c:655 ../rpm.c:664
+#: ../rpm.c:671 ../rpm.c:718 ../rpm.c:724 ../rpm.c:784 ../rpm.c:792
+#: ../rpm.c:799 ../rpm.c:808 ../rpm.c:815 ../rpm.c:823 ../rpm.c:852
+#: ../rpm.c:907 ../rpm.c:914
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: ../rpm.c:652
+#: ../rpm.c:657
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: ../rpm.c:654
+#: ../rpm.c:659
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: ../rpm.c:670
+#: ../rpm.c:675
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:674
+#: ../rpm.c:679
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:726 ../rpm.c:732 ../rpm.c:739 ../rpm.c:746 ../rpm.c:755
-#: ../rpm.c:763 ../rpm.c:771 ../rpm.c:916
+#: ../rpm.c:731 ../rpm.c:737 ../rpm.c:744 ../rpm.c:751 ../rpm.c:760
+#: ../rpm.c:768 ../rpm.c:776 ../rpm.c:921
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: ../rpm.c:826
+#: ../rpm.c:831
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: ../rpm.c:853
+#: ../rpm.c:858
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: ../rpm.c:855
+#: ../rpm.c:860
 msgid "relocations must contain a ="
 msgstr ""
 
-#: ../rpm.c:858
+#: ../rpm.c:863
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: ../rpm.c:867
+#: ../rpm.c:872
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: ../rpm.c:876
+#: ../rpm.c:881
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: ../rpm.c:929
+#: ../rpm.c:934
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: ../rpm.c:934
+#: ../rpm.c:939
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: ../rpm.c:937
+#: ../rpm.c:942
 msgid "unexpected query flags"
 msgstr ""
 
-#: ../rpm.c:940
+#: ../rpm.c:945
 msgid "unexpected query format"
 msgstr ""
 
-#: ../rpm.c:944
+#: ../rpm.c:949
 msgid "unexpected query source"
 msgstr ""
 
-#: ../rpm.c:950
+#: ../rpm.c:955
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: ../rpm.c:953
+#: ../rpm.c:958
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: ../rpm.c:956
+#: ../rpm.c:961
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: ../rpm.c:959
+#: ../rpm.c:964
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:962
+#: ../rpm.c:967
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:965
+#: ../rpm.c:970
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: ../rpm.c:968
+#: ../rpm.c:973
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:972
+#: ../rpm.c:977
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:976
+#: ../rpm.c:981
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:980
+#: ../rpm.c:985
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:984
+#: ../rpm.c:989
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:988
+#: ../rpm.c:993
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:992
+#: ../rpm.c:997
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: ../rpm.c:996
+#: ../rpm.c:1001
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:1000
+#: ../rpm.c:1005
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:1004
+#: ../rpm.c:1009
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:1008
+#: ../rpm.c:1013
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: ../rpm.c:1012
+#: ../rpm.c:1017
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:1016
+#: ../rpm.c:1021
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: ../rpm.c:1021
+#: ../rpm.c:1026
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1025
+#: ../rpm.c:1030
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1031
+#: ../rpm.c:1036
 msgid ""
 "--nodeps may only be specified during package building, installation, "
 "erasure, and verification"
 msgstr ""
 
-#: ../rpm.c:1036
+#: ../rpm.c:1041
 msgid "--nofiles may only be specified during package verification"
 msgstr ""
 
-#: ../rpm.c:1042
+#: ../rpm.c:1047
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: ../rpm.c:1047
+#: ../rpm.c:1052
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: ../rpm.c:1052
+#: ../rpm.c:1057
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: ../rpm.c:1056
+#: ../rpm.c:1061
 msgid "--clean may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1059
+#: ../rpm.c:1064
 msgid "--rmsource may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1062
+#: ../rpm.c:1067
 msgid "--short-circuit may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1066
+#: ../rpm.c:1071
 msgid "--short-circuit may only be used with -bc, -bi, -bs, -tc -ti, or -ts"
 msgstr ""
 
-#: ../rpm.c:1072
+#: ../rpm.c:1077
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: ../rpm.c:1077
+#: ../rpm.c:1082
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1083
+#: ../rpm.c:1088
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1087
+#: ../rpm.c:1092
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1090
+#: ../rpm.c:1095
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1093
+#: ../rpm.c:1098
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: ../rpm.c:1119
+#: ../rpm.c:1124
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1136
+#: ../rpm.c:1141
 msgid "pgp not found: "
 msgstr ""
 
-#: ../rpm.c:1139
+#: ../rpm.c:1144
 msgid "Use `%%_signature pgp5' instead of `%%_signature pgp' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1146
+#: ../rpm.c:1151
 msgid "pgp version 5 not found: "
 msgstr ""
 
-#: ../rpm.c:1149
+#: ../rpm.c:1154
 msgid "Use `%%_signature pgp' instead of `%%_signature pgp5' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1155
+#: ../rpm.c:1160
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: ../rpm.c:1156
+#: ../rpm.c:1161
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1159
+#: ../rpm.c:1164
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1166
+#: ../rpm.c:1171
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1171
+#: ../rpm.c:1176
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1188
+#: ../rpm.c:1193
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1207
+#: ../rpm.c:1212
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1218
+#: ../rpm.c:1223
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1230
+#: ../rpm.c:1235
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1243
+#: ../rpm.c:1248
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1300
+#: ../rpm.c:1305
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1302
+#: ../rpm.c:1307
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1314
+#: ../rpm.c:1319
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1363
+#: ../rpm.c:1368
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1386
+#: ../rpm.c:1391
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1391
+#: ../rpm.c:1396
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1412
+#: ../rpm.c:1417
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: ../rpm.c:1416
+#: ../rpm.c:1421
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1527,17 +1527,17 @@ msgstr ""
 msgid "Unable to open temp file"
 msgstr ""
 
-#: ../build/build.c:122
+#: ../build/build.c:124
 #, c-format
 msgid "Executing: %s\n"
 msgstr ""
 
-#: ../build/build.c:126
+#: ../build/build.c:128
 #, c-format
 msgid "Exec of %s failed (%s)"
 msgstr ""
 
-#: ../build/build.c:136
+#: ../build/build.c:138
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
@@ -2104,27 +2104,28 @@ msgstr ""
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: ../build/parseReqs.c:95
+#: ../build/parseReqs.c:94
 #, c-format
-msgid "line %d: tokens must begin with alpha-numeric, '_' or '/': %s"
+msgid ""
+"line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: ../build/parseReqs.c:106
+#: ../build/parseReqs.c:105
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:139
+#: ../build/parseReqs.c:137
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:149
+#: ../build/parseReqs.c:147
 #, c-format
 msgid "line %d: Version not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:169
+#: ../build/parseReqs.c:167
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
@@ -2892,62 +2893,62 @@ msgstr ""
 msgid "rpmQuery: rpmdbOpen() failed\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:18
+#: ../lib/rebuilddb.c:19
 #, c-format
 msgid "rebuilding database in rootdir %s\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:22 ../lib/rpmdb.c:64 ../lib/rpmdb.c:82 ../lib/rpmdb.c:98
+#: ../lib/rebuilddb.c:23 ../lib/rpmdb.c:64 ../lib/rpmdb.c:82 ../lib/rpmdb.c:98
 msgid "no dbpath has been set"
 msgstr ""
 
-#: ../lib/rebuilddb.c:30
+#: ../lib/rebuilddb.c:32
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: ../lib/rebuilddb.c:34
+#: ../lib/rebuilddb.c:36
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:36
+#: ../lib/rebuilddb.c:38
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: ../lib/rebuilddb.c:44
+#: ../lib/rebuilddb.c:42
 msgid "opening old database\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:51
+#: ../lib/rebuilddb.c:49
 msgid "opening new database\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:61 ../lib/rebuilddb.c:79
+#: ../lib/rebuilddb.c:59 ../lib/rebuilddb.c:77
 #, c-format
 msgid "record number %d in database is bad -- skipping it"
 msgstr ""
 
-#: ../lib/rebuilddb.c:73
+#: ../lib/rebuilddb.c:71
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: ../lib/rebuilddb.c:92
+#: ../lib/rebuilddb.c:90
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:100
+#: ../lib/rebuilddb.c:98
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: ../lib/rebuilddb.c:102
+#: ../lib/rebuilddb.c:100
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: ../lib/rebuilddb.c:108
+#: ../lib/rebuilddb.c:106
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""