summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.in17
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/db3.c17
-rw-r--r--lib/poptQV.c8
-rw-r--r--lib/rpmdb.c53
-rw-r--r--perl/Makefile.in5
-rw-r--r--po/rpm.pot804
-rw-r--r--python/Makefile.in5
-rwxr-xr-xrpm.c22
-rwxr-xr-xrpmqv.c20
-rw-r--r--scripts/Makefile.in5
11 files changed, 492 insertions, 470 deletions
diff --git a/configure.in b/configure.in
index ed58a36da..57cd22555 100644
--- a/configure.in
+++ b/configure.in
@@ -309,28 +309,35 @@ dnl will fail.
AC_CHECK_LIB(port, writev)
DBLIBOBJS=""
+libdb3=""
+libdb2=""
+libdb1=""
PTHREAD=""
dnl Check for Berkeley db3 API.
AC_CHECK_FUNC(db_create, [DBLIBOBJS="$DBLIBOBJS db3.c"],
AC_CHECK_LIB(db, db_create, [LIBS="$LIBS $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c"],
- AC_CHECK_LIB(db-3.0, db_create, [LIBS="$LIBS $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c"],,$PTHREAD))
+ AC_CHECK_LIB(db-3.1, db_create, [LIBS="$LIBS $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c" ; libdb3="-L /usr/lib -ldb-3.1"],
+ AC_CHECK_LIB(db-3.0, db_create, [LIBS="$LIBS $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c"; libdb3="-L /usr/lib -ldb-3.0"],,$PTHREAD)))
)
dnl Check for Berkeley db2 API.
dnl AC_CHECK_FUNC(db_open, [DBLIBOBJS="$DBLIBOBJS db2.c"],
-dnl AC_CHECK_LIB(db, db_open, [LIBS="$LIBS -ldb"; DBLIBOBJS="$DBLIBOBJS db2.c"])
+dnl AC_CHECK_LIB(db, db_open, [LIBS="$LIBS"; DBLIBOBJS="$DBLIBOBJS db2.c" ; libdb2="-L /usr/lib -ldb"])
dnl )
dnl Check for Berkeley db1 API retrofit to db2/db3 database.
dnl AC_CHECK_FUNC(dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"],
dnl AC_CHECK_LIB(db, dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"])
dnl )
dnl Check for Berkeley db1 API in glibc.
-AC_CHECK_LIB(db1, dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"])
+AC_CHECK_LIB(db1, dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c" ; libdb1="-L /usr/lib -ldb1"])
if test X"$DBLIBOBJS" = X; then
- AC_MSG_ERROR([sorry rpm requires libdb.a or libdb1.a (from the Berkeley db package)])
+ AC_MSG_ERROR([sorry rpm requires libdb-3.x.a or libdb1.a (from the Berkeley db package)])
fi
-dnl AC_DEFINE_UNQUOTED(DBLIBOBJS, "$DBLIBOBJS")
+
AC_SUBST(DBLIBOBJS)
+AC_SUBST(libdb3)
+AC_SUBST(libdb2)
+AC_SUBST(libdb1)
for dbi in $DBLIBOBJS; do
case $dbi in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cd90323ec..753f83861 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -41,7 +41,7 @@ falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h
db3.lo: db3.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
for F in $*.o $*.lo ; do \
- @__LD@ -r -o $${F}.o $${F} -L/usr/lib -ldb-3.0 ; \
+ @__LD@ -r -o $${F}.o $${F} @libdb3@ ; \
@__OBJCOPY@ `\
@__NM@ -g --defined-only $${F}.o | \
sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
@@ -52,7 +52,7 @@ db3.lo: db3.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
db2.lo: db2.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
for F in $*.o $*.lo ; do \
- @__LD@ -r -o $${F}.o $${F} -L/usr/lib -ldb ; \
+ @__LD@ -r -o $${F}.o $${F} @libdb2@ ; \
@__OBJCOPY@ `\
@__NM@ -g --defined-only $${F}.o | \
sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
@@ -63,7 +63,7 @@ db2.lo: db2.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
db1.lo: db1.c falloc.lo $(top_srcdir)/system.h rpmlib.h rpmdb.h
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
for F in $*.o $*.lo ; do \
- @__LD@ -r -o $${F}.o $${F} falloc.lo -L/usr/lib -ldb1 ; \
+ @__LD@ -r -o $${F}.o $${F} falloc.lo @libdb1@ ; \
@__OBJCOPY@ `\
@__NM@ -g --defined-only $${F}.o | \
sed -e '/ [DRTW] /!d' -e 's/.* [DRTW] /-L /' | \
diff --git a/lib/db3.c b/lib/db3.c
index 5a01b7023..8b2e9693d 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -446,7 +446,6 @@ static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile,
DB_ENV * dbenv = dbi->dbi_dbenv;
#if defined(__USE_DB3)
- char **dbconfig = NULL;
int rc;
if (dbenv == NULL) {
@@ -466,7 +465,11 @@ static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile,
xx = db_env_create(&dbenv, 0);
xx = cvtdberr(dbi, "db_env_create", rc, _debug);
- xx = dbenv->remove(dbenv, dbhome, dbconfig, 0);
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 1
+ xx = dbenv->remove(dbenv, dbhome, 0);
+#else
+ xx = dbenv->remove(dbenv, dbhome, NULL, 0);
+#endif
xx = cvtdberr(dbi, "dbenv->remove", rc, _debug);
if (dbfile)
@@ -540,8 +543,12 @@ static int db_init(dbiIndex dbi, const char *dbhome, const char *dbfile,
/* dbenv->set_tx_max(???) */
/* dbenv->set_tx_recover(???) */
if (dbi->dbi_no_fsync) {
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 1
+ xx = db_env_set_func_fsync(db3_fsync_disable);
+#else
xx = dbenv->set_func_fsync(dbenv, db3_fsync_disable);
- xx = cvtdberr(dbi, "dbenv->set_func_fsync", xx, _debug);
+#endif
+ xx = cvtdberr(dbi, "db_env_set_func_fsync", xx, _debug);
}
}
#else /* __USE_DB3 */
@@ -554,7 +561,11 @@ static int db_init(dbiIndex dbi, const char *dbhome, const char *dbfile,
#endif /* __USE_DB3 */
#if defined(__USE_DB3)
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 1
+ rc = dbenv->open(dbenv, dbhome, eflags, dbi->dbi_perms);
+#else
rc = dbenv->open(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
+#endif
rc = cvtdberr(dbi, "dbenv->open", rc, _debug);
if (rc)
goto errxit;
diff --git a/lib/poptQV.c b/lib/poptQV.c
index aade62f29..d8e123bf0 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -58,12 +58,14 @@ static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
struct poptOption rpmQVSourcePoptTable[] = {
{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
rpmQVSourceArgCallback, 0, NULL, NULL },
+ { "all", 'a', 0, 0, 'a',
+ N_("query/verify all packages"), NULL },
{ "file", 'f', 0, 0, 'f',
- N_("query package owning file"), "FILE" },
+ N_("query/verify package owning file"), "FILE" },
{ "group", 'g', 0, 0, 'g',
- N_("query packages in group"), "GROUP" },
+ N_("query/verify packages in group"), "GROUP" },
{ "package", 'p', 0, 0, 'p',
- N_("query a package file"), NULL },
+ N_("query/verify a package file"), NULL },
{ "query", 'q', 0, NULL, 'q',
N_("rpm query mode"), NULL },
{ "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0,
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 4c2e59ebb..a0290851d 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -1363,7 +1363,6 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi,
{
dbiIndex dbi = NULL;
dbiIndexSet set = NULL;
- int i;
int rc;
int xx;
@@ -1381,12 +1380,8 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi,
rc = dbiSearch(dbi, keyp, keylen, &set);
xx = dbiCclose(dbi, NULL, 0);
- switch (rc) {
- default:
- case -1: /* error */
- case 1: /* not found */
- break;
- case 0: /* success */
+ if (rc == 0) { /* success */
+ int i;
for (i = 0; i < set->count; i++)
set->recs[i].fpNum = fpNum;
@@ -1400,7 +1395,6 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi,
set->count * sizeof(*(mi->mi_set->recs)));
mi->mi_set->count += set->count;
}
- break;
}
if (set)
@@ -1476,16 +1470,10 @@ fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw);
rc = dbiSearch(dbi, keyp, keylen, &set);
xx = dbiCclose(dbi, NULL, 0);
}
- switch (rc) {
- default:
- case -1: /* error */
- case 1: /* not found */
+ if (rc) { /* error/not found */
if (set)
dbiFreeIndexSet(set);
return NULL;
- /*@notreached@*/ break;
- case 0: /* success */
- break;
}
}
@@ -1530,19 +1518,14 @@ static inline int removeIndexEntry(dbiIndex dbi, const char * keyp,
rc = dbiSearch(dbi, keyp, 0, &set);
- switch (rc) {
- case -1: /* error */
- rc = 1;
- break; /* error message already generated from dbindex.c */
- case 1: /* not found */
+ if (rc < 0) /* not found */
rc = 0;
- break;
- case 0: /* success */
- if (dbiPruneSet(set, rec, 1, sizeof(*rec), 1))
- break;
- if (dbiUpdateIndex(dbi, keyp, set))
+ else if (rc > 0) /* error */
+ rc = 1; /* error message already generated from dbindex.c */
+ else { /* success */
+ if (!dbiPruneSet(set, rec, 1, sizeof(*rec), 1) &&
+ dbiUpdateIndex(dbi, keyp, set))
rc = 1;
- break;
}
if (set) {
@@ -1697,20 +1680,16 @@ static inline int addIndexEntry(dbiIndex dbi, const char *index, dbiIndexItem re
rc = dbiSearch(dbi, index, 0, &set);
- switch (rc) {
- default:
- case -1: /* error */
- rc = 1;
- break;
- case 1: /* not found */
- rc = 0;
- set = xcalloc(1, sizeof(*set));
- /*@fallthrough@*/
- case 0: /* success */
+ if (rc > 0) {
+ rc = 1; /* error */
+ } else {
+ if (rc < 0) { /* not found */
+ rc = 0;
+ set = xcalloc(1, sizeof(*set));
+ }
dbiAppendSet(set, rec, 1, sizeof(*rec), 0);
if (dbiUpdateIndex(dbi, index, set))
rc = 1;
- break;
}
if (set) {
diff --git a/perl/Makefile.in b/perl/Makefile.in
index 6b452e649..8a9c0eec3 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -155,6 +155,9 @@ __SSH = @__SSH@
__STRIP = @__STRIP@
__TAR = @__TAR@
l = @l@
+libdb1 = @libdb1@
+libdb2 = @libdb2@
+libdb3 = @libdb3@
testdir = @testdir@
tmpdir = @tmpdir@
varprefix = @varprefix@
@@ -228,7 +231,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/po/rpm.pot b/po/rpm.pot
index 092b03c28..61867f2cf 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-09 17:03-0400\n"
+"POT-Creation-Date: 2000-06-11 15:08-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"
@@ -107,1040 +107,1040 @@ msgstr ""
msgid "no copyright!\n"
msgstr ""
-#: rpm.c:179 rpmqv.c:257
+#: rpm.c:181 rpmqv.c:259
#, c-format
msgid "rpm: %s\n"
msgstr ""
-#: rpm.c:190 rpmqv.c:268
+#: rpm.c:192 rpmqv.c:270
#, c-format
msgid "RPM version %s\n"
msgstr ""
-#: rpm.c:194 rpmqv.c:272
+#: rpm.c:196 rpmqv.c:274
msgid "Copyright (C) 1998 - Red Hat Software"
msgstr ""
-#: rpm.c:195 rpmqv.c:273
+#: rpm.c:197 rpmqv.c:275
msgid "This may be freely redistributed under the terms of the GNU GPL"
msgstr ""
-#: rpm.c:203
+#: rpm.c:205
msgid "Usage: rpm {--help}"
msgstr ""
-#: rpm.c:204
+#: rpm.c:206
msgid " rpm {--version}"
msgstr ""
-#: rpm.c:205
+#: rpm.c:207
msgid " rpm {--initdb} [--dbpath <dir>]"
msgstr ""
-#: rpm.c:206
+#: rpm.c:208
msgid ""
" rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:207 rpmqv.c:294
+#: rpm.c:209 rpmqv.c:296
msgid " [--replacepkgs] [--replacefiles] [--root <dir>]"
msgstr ""
-#: rpm.c:208 rpmqv.c:295
+#: rpm.c:210 rpmqv.c:297
msgid " [--excludedocs] [--includedocs] [--noscripts]"
msgstr ""
-#: rpm.c:209 rpmqv.c:296
+#: rpm.c:211 rpmqv.c:298
msgid ""
" [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:210 rpmqv.c:297
+#: rpm.c:212 rpmqv.c:299
msgid ""
" [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
msgstr ""
-#: rpm.c:211 rpmqv.c:298
+#: rpm.c:213 rpmqv.c:300
msgid ""
" [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
msgstr ""
-#: rpm.c:212 rpm.c:221 rpm.c:230 rpmqv.c:299 rpmqv.c:308 rpmqv.c:323
+#: rpm.c:214 rpm.c:223 rpm.c:232 rpmqv.c:301 rpmqv.c:310 rpmqv.c:325
msgid " [--httpproxy <host>] [--httpport <port>] "
msgstr ""
-#: rpm.c:213 rpm.c:223 rpmqv.c:300 rpmqv.c:310
+#: rpm.c:215 rpm.c:225 rpmqv.c:302 rpmqv.c:312
msgid " [--noorder] [--relocate oldpath=newpath]"
msgstr ""
-#: rpm.c:214 rpmqv.c:301
+#: rpm.c:216 rpmqv.c:303
msgid ""
" [--badreloc] [--notriggers] [--excludepath <path>]"
msgstr ""
-#: rpm.c:215 rpmqv.c:302
+#: rpm.c:217 rpmqv.c:304
msgid " [--ignoresize] file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:216
+#: rpm.c:218
msgid ""
" rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
msgstr ""
-#: rpm.c:217 rpmqv.c:304
+#: rpm.c:219 rpmqv.c:306
msgid " [--oldpackage] [--root <dir>] [--noscripts]"
msgstr ""
-#: rpm.c:218 rpmqv.c:305
+#: rpm.c:220 rpmqv.c:307
msgid ""
" [--excludedocs] [--includedocs] [--rcfile <file>]"
msgstr ""
-#: rpm.c:219 rpmqv.c:306
+#: rpm.c:221 rpmqv.c:308
msgid ""
" [--ignorearch] [--dbpath <dir>] [--prefix <dir>] "
msgstr ""
-#: rpm.c:220 rpmqv.c:307
+#: rpm.c:222 rpmqv.c:309
msgid " [--ftpproxy <host>] [--ftpport <port>]"
msgstr ""
-#: rpm.c:222 rpmqv.c:309
+#: rpm.c:224 rpmqv.c:311
msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
msgstr ""
-#: rpm.c:224 rpmqv.c:311
+#: rpm.c:226 rpmqv.c:313
msgid ""
" [--badreloc] [--excludepath <path>] [--ignoresize]"
msgstr ""
-#: rpm.c:225 rpmqv.c:312
+#: rpm.c:227 rpmqv.c:314
msgid " file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:226
+#: rpm.c:228
msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
msgstr ""
-#: rpm.c:227 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
msgid " [--scripts] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
msgid " [--whatprovides] [--whatrequires] [--requires]"
msgstr ""
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
msgid ""
" [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
msgstr ""
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:233 rpmqv.c:326
msgid ""
" [--ftpport <port>] [--provides] [--triggers] [--dump]"
msgstr ""
-#: rpm.c:232 rpmqv.c:325
+#: rpm.c:234 rpmqv.c:327
msgid " [--changelog] [--dbpath <dir>] [targets]"
msgstr ""
-#: rpm.c:233
+#: rpm.c:235
msgid " rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
msgstr ""
-#: rpm.c:234 rpmqv.c:327
+#: rpm.c:236 rpmqv.c:329
msgid ""
" [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
msgstr ""
-#: rpm.c:235 rpmqv.c:328
+#: rpm.c:237 rpmqv.c:330
msgid " [--nomd5] [targets]"
msgstr ""
-#: rpm.c:236
+#: rpm.c:238
msgid " rpm {--setperms} [-afpg] [target]"
msgstr ""
-#: rpm.c:237
+#: rpm.c:239
msgid " rpm {--setugids} [-afpg] [target]"
msgstr ""
-#: rpm.c:238
+#: rpm.c:240
msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm"
msgstr ""
-#: rpm.c:239
+#: rpm.c:241
msgid " rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
msgstr ""
-#: rpm.c:240 rpmqv.c:314
+#: rpm.c:242 rpmqv.c:316
msgid " [--dbpath <dir>] [--nodeps] [--allmatches]"
msgstr ""
-#: rpm.c:241 rpmqv.c:315
+#: rpm.c:243 rpmqv.c:317
msgid ""
" [--justdb] [--notriggers] rpackage1 ... packageN"
msgstr ""
-#: rpm.c:242
+#: rpm.c:244
msgid ""
" rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
"<file>]"
msgstr ""
-#: rpm.c:243
+#: rpm.c:245
msgid " [--sign] [--nobuild] [--timecheck <s>] ]"
msgstr ""
-#: rpm.c:244 rpmqv.c:337
+#: rpm.c:246 rpmqv.c:339
msgid " [--target=platform1[,platform2...]]"
msgstr ""
-#: rpm.c:245 rpmqv.c:338
+#: rpm.c:247 rpmqv.c:340
msgid " [--rmsource] [--rmspec] specfile"
msgstr ""
-#: rpm.c:246
+#: rpm.c:248
msgid " rpm {--rmsource} [--rcfile <file>] [-v] specfile"
msgstr ""
-#: rpm.c:247
+#: rpm.c:249
msgid ""
" rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
msgstr ""
-#: rpm.c:248
+#: rpm.c:250
msgid ""
" rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
msgstr ""
-#: rpm.c:249
+#: rpm.c:251
msgid " rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:250
+#: rpm.c:252
msgid " rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpm.c:251
+#: rpm.c:253
msgid ""
" rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
msgstr ""
-#: rpm.c:252 rpmqv.c:349
+#: rpm.c:254 rpmqv.c:351
msgid " package1 ... packageN"
msgstr ""
-#: rpm.c:253
+#: rpm.c:255
msgid " rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
msgstr ""
-#: rpm.c:254
+#: rpm.c:256
msgid " rpm {--querytags}"
msgstr ""
-#: rpm.c:288 rpmqv.c:385
+#: rpm.c:290 rpmqv.c:387
msgid "Usage:"
msgstr ""
-#: rpm.c:290 rpmqv.c:387
+#: rpm.c:292 rpmqv.c:389
msgid "print this message"
msgstr ""
-#: rpm.c:292 rpmqv.c:389
+#: rpm.c:294 rpmqv.c:391
msgid "print the version of rpm being used"
msgstr ""
-#: rpm.c:295
+#: rpm.c:297
msgid " All modes support the following arguments:"
msgstr ""
-#: rpm.c:296
+#: rpm.c:298
msgid " --define '<name> <body>'"
msgstr ""
-#: rpm.c:297 rpmqv.c:394
+#: rpm.c:299 rpmqv.c:396
msgid "define macro <name> with value <body>"
msgstr ""
-#: rpm.c:298
+#: rpm.c:300
msgid " --eval '<name>+' "
msgstr ""
-#: rpm.c:299 rpmqv.c:396
+#: rpm.c:301 rpmqv.c:398
msgid "print the expansion of macro <name> to stdout"
msgstr ""
-#: rpm.c:300
+#: rpm.c:302
msgid " --pipe <cmd> "
msgstr ""
-#: rpm.c:301 rpmqv.c:398
+#: rpm.c:303 rpmqv.c:400
msgid "send stdout to <cmd>"
msgstr ""
-#: rpm.c:302
+#: rpm.c:304
msgid " --rcfile <file> "
msgstr ""
-#: rpm.c:303 rpmqv.c:400
+#: rpm.c:305 rpmqv.c:402
msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
msgstr ""
-#: rpm.c:305 rpmqv.c:402
+#: rpm.c:307 rpmqv.c:404
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: rpm.c:307 rpmqv.c:410
+#: rpm.c:309 rpmqv.c:412
msgid "be a little more verbose"
msgstr ""
-#: rpm.c:309 rpmqv.c:412
+#: rpm.c:311 rpmqv.c:414
msgid "be incredibly verbose (for debugging)"
msgstr ""
-#: rpm.c:312
+#: rpm.c:314
msgid " Install, upgrade and query (with -p) allow URL's to be used in place"
msgstr ""
-#: rpm.c:313
+#: rpm.c:315
msgid " of file names as well as the following options:"
msgstr ""
-#: rpm.c:314
+#: rpm.c:316
msgid " --ftpproxy <host> "
msgstr ""
-#: rpm.c:315 rpmqv.c:419
+#: rpm.c:317 rpmqv.c:421
msgid "hostname or IP of ftp proxy"
msgstr ""
-#: rpm.c:316
+#: rpm.c:318
msgid " --ftpport <port> "
msgstr ""
-#: rpm.c:317 rpmqv.c:421
+#: rpm.c:319 rpmqv.c:423
msgid "port number of ftp server (or proxy)"
msgstr ""
-#: rpm.c:318
+#: rpm.c:320
msgid " --httpproxy <host> "
msgstr ""
-#: rpm.c:319 rpmqv.c:423
+#: rpm.c:321 rpmqv.c:425
msgid "hostname or IP of http proxy"
msgstr ""
-#: rpm.c:320
+#: rpm.c:322
msgid " --httpport <port> "
msgstr ""
-#: rpm.c:321 rpmqv.c:425
+#: rpm.c:323 rpmqv.c:427
msgid "port number of http server (or proxy)"
msgstr ""
-#: rpm.c:325 rpmqv.c:445
+#: rpm.c:327 rpmqv.c:447
msgid "query mode"
msgstr ""
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
+#: rpm.c:328 rpm.c:374 rpm.c:399 rpm.c:451 rpm.c:525
msgid " --dbpath <dir> "
msgstr ""
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:405
+#: rpm.c:329 rpm.c:375 rpm.c:400 rpm.c:452 rpm.c:526 rpmqv.c:407
msgid "use <dir> as the directory for the database"
msgstr ""
-#: rpm.c:328
+#: rpm.c:330
msgid " --queryformat <qfmt>"
msgstr ""
-#: rpm.c:329 rpmqv.c:447
+#: rpm.c:331 rpmqv.c:449
msgid "use <qfmt> as the header format (implies --info)"
msgstr ""
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
+#: rpm.c:332 rpm.c:376 rpm.c:434 rpm.c:463
msgid " --root <dir> "
msgstr ""
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:407
+#: rpm.c:333 rpm.c:377 rpm.c:435 rpm.c:464 rpm.c:528 rpmqv.c:409
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpm.c:332
+#: rpm.c:334
msgid " Package specification options:"
msgstr ""
-#: rpm.c:334
+#: rpm.c:336
msgid "query all packages"
msgstr ""
-#: rpm.c:335
+#: rpm.c:337
msgid " -f <file>+ "
msgstr ""
-#: rpm.c:336
+#: rpm.c:338
msgid "query package owning <file>"
msgstr ""
-#: rpm.c:337
+#: rpm.c:339
msgid " -p <packagefile>+ "
msgstr ""
-#: rpm.c:338
+#: rpm.c:340
msgid "query (uninstalled) package <packagefile>"
msgstr ""
-#: rpm.c:339
+#: rpm.c:341
msgid " --triggeredby <pkg>"
msgstr ""
-#: rpm.c:340
+#: rpm.c:342
msgid "query packages triggered by <pkg>"
msgstr ""
-#: rpm.c:341
+#: rpm.c:343
msgid " --whatprovides <cap>"
msgstr ""
-#: rpm.c:342
+#: rpm.c:344
msgid "query packages which provide <cap> capability"
msgstr ""
-#: rpm.c:343
+#: rpm.c:345
msgid " --whatrequires <cap>"
msgstr ""
-#: rpm.c:344
+#: rpm.c:346
msgid "query packages which require <cap> capability"
msgstr ""
-#: rpm.c:345
+#: rpm.c:347
msgid " Information selection options:"
msgstr ""
-#: rpm.c:347 rpmqv.c:451
+#: rpm.c:349 rpmqv.c:453
msgid "display package information"
msgstr ""
-#: rpm.c:349 rpmqv.c:453
+#: rpm.c:351 rpmqv.c:455
msgid "display the package's change log"
msgstr ""
-#: rpm.c:351 rpmqv.c:455
+#: rpm.c:353 rpmqv.c:457
msgid "display package file list"
msgstr ""
-#: rpm.c:353 rpmqv.c:457
+#: rpm.c:355 rpmqv.c:459
msgid "show file states (implies -l)"
msgstr ""
-#: rpm.c:355 rpmqv.c:459
+#: rpm.c:357 rpmqv.c:461
msgid "list only documentation files (implies -l)"
msgstr ""
-#: rpm.c:357 rpmqv.c:461
+#: rpm.c:359 rpmqv.c:463
msgid "list only configuration files (implies -l)"
msgstr ""
-#: rpm.c:359 rpmqv.c:463
+#: rpm.c:361 rpmqv.c:465
msgid ""
"show all verifiable information for each file (must be used with -l, -c, or "
"-d)"
msgstr ""
-#: rpm.c:361
+#: rpm.c:363
msgid "list capabilities package provides"
msgstr ""
-#: rpm.c:363
+#: rpm.c:365
msgid "list package dependencies"
msgstr ""
-#: rpm.c:365
+#: rpm.c:367
msgid "print the various [un]install scripts"
msgstr ""
-#: rpm.c:367
+#: rpm.c:369
msgid "show the trigger scripts contained in the package"
msgstr ""
-#: rpm.c:371 rpmqv.c:474
+#: rpm.c:373 rpmqv.c:476
msgid ""
"verify a package installation using the same same package specification "
"options as -q"
msgstr ""
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:476 rpmqv.c:522 rpmqv.c:556
+#: rpm.c:379 rpm.c:421 rpm.c:456 rpmqv.c:478 rpmqv.c:524 rpmqv.c:558
msgid "do not verify package dependencies"
msgstr ""
-#: rpm.c:379 rpmqv.c:478
+#: rpm.c:381 rpmqv.c:480
msgid "do not verify file md5 checksums"
msgstr ""
-#: rpm.c:381 rpmqv.c:480
+#: rpm.c:383 rpmqv.c:482
msgid "do not verify file attributes"
msgstr ""
-#: rpm.c:383 rpmqv.c:483
+#: rpm.c:385 rpmqv.c:485
msgid "list the tags that can be used in a query format"
msgstr ""
-#: rpm.c:386
+#: rpm.c:388
msgid " --install <packagefile>"
msgstr ""
-#: rpm.c:387
+#: rpm.c:389
msgid " -i <packagefile> "
msgstr ""
-#: rpm.c:388 rpmqv.c:497
+#: rpm.c:390 rpmqv.c:499
msgid "install package"
msgstr ""
-#: rpm.c:389
+#: rpm.c:391
msgid " --excludepath <path>"
msgstr ""
-#: rpm.c:390
+#: rpm.c:392
msgid "skip files in path <path>"
msgstr ""
-#: rpm.c:391
+#: rpm.c:393
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpm.c:392 rpmqv.c:534
+#: rpm.c:394 rpmqv.c:536
msgid "relocate files from <oldpath> to <newpath>"
msgstr ""
-#: rpm.c:394 rpmqv.c:502
+#: rpm.c:396 rpmqv.c:504
msgid "relocate files in non-relocateable package"
msgstr ""
-#: rpm.c:395
+#: rpm.c:397
msgid " --prefix <dir> "
msgstr ""
-#: rpm.c:396 rpmqv.c:532
+#: rpm.c:398 rpmqv.c:534
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: rpm.c:400 rpmqv.c:504
+#: rpm.c:402 rpmqv.c:506
msgid "do not install documentation"
msgstr ""
-#: rpm.c:402 rpmqv.c:508
+#: rpm.c:404 rpmqv.c:510
msgid "short hand for --replacepkgs --replacefiles"
msgstr ""
-#: rpm.c:404 rpmqv.c:510
+#: rpm.c:406 rpmqv.c:512
msgid "print hash marks as package installs (good with -v)"
msgstr ""
-#: rpm.c:406 rpmqv.c:499
+#: rpm.c:408 rpmqv.c:501
msgid "install all files, even configurations which might otherwise be skipped"
msgstr ""
-#: rpm.c:409 rpmqv.c:512
+#: rpm.c:411 rpmqv.c:514
msgid "don't verify package architecture"
msgstr ""
-#: rpm.c:411 rpmqv.c:514
+#: rpm.c:413 rpmqv.c:516
msgid "don't check disk space before installing"
msgstr ""
-#: rpm.c:413 rpmqv.c:516
+#: rpm.c:415 rpmqv.c:518
msgid "don't verify package operating system"
msgstr ""
-#: rpm.c:415 rpmqv.c:518
+#: rpm.c:417 rpmqv.c:520
msgid "install documentation"
msgstr ""
-#: rpm.c:417 rpm.c:452 rpmqv.c:520 rpmqv.c:554
+#: rpm.c:419 rpm.c:454 rpmqv.c:522 rpmqv.c:556
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: rpm.c:421 rpm.c:456 rpmqv.c:524 rpmqv.c:558
+#: rpm.c:423 rpm.c:458 rpmqv.c:526 rpmqv.c:560
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: rpm.c:423
+#: rpm.c:425
msgid "don't execute any installation scripts"
msgstr ""
-#: rpm.c:425 rpm.c:460 rpmqv.c:562
+#: rpm.c:427 rpm.c:462 rpmqv.c:564
msgid "don't execute any scripts triggered by this package"
msgstr ""
-#: rpm.c:427 rpmqv.c:530
+#: rpm.c:429 rpmqv.c:532
msgid "print percentages as package installs"
msgstr ""
-#: rpm.c:429 rpmqv.c:536
+#: rpm.c:431 rpmqv.c:538
msgid "install even if the package replaces installed files"
msgstr ""
-#: rpm.c:431 rpmqv.c:538
+#: rpm.c:433 rpmqv.c:540
msgid "reinstall if the package is already present"
msgstr ""
-#: rpm.c:435 rpmqv.c:540
+#: rpm.c:437 rpmqv.c:542
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: rpm.c:438
+#: rpm.c:440
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpm.c:439
+#: rpm.c:441
msgid " -U <packagefile> "
msgstr ""
-#: rpm.c:440 rpmqv.c:544
+#: rpm.c:442 rpmqv.c:546
msgid "upgrade package (same options as --install, plus)"
msgstr ""
-#: rpm.c:442 rpmqv.c:546
+#: rpm.c:444 rpmqv.c:548
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: rpm.c:444
+#: rpm.c:446
msgid " --erase <package>"
msgstr ""
-#: rpm.c:446 rpmqv.c:550
+#: rpm.c:448 rpmqv.c:552
msgid "erase (uninstall) package"
msgstr ""
-#: rpm.c:448 rpmqv.c:552
+#: rpm.c:450 rpmqv.c:554
msgid ""
"remove all packages which match <package> (normally an error is generated if "
"<package> specified multiple packages)"
msgstr ""
-#: rpm.c:458 rpmqv.c:560
+#: rpm.c:460 rpmqv.c:562
msgid "do not execute any package specific scripts"
msgstr ""
-#: rpm.c:464
+#: rpm.c:466
msgid " -b<stage> <spec> "
msgstr ""
-#: rpm.c:465
+#: rpm.c:467
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpm.c:466 rpmqv.c:569
+#: rpm.c:468 rpmqv.c:571
msgid "build package, where <stage> is one of:"
msgstr ""
-#: rpm.c:468 rpmqv.c:571
+#: rpm.c:470 rpmqv.c:573
msgid "prep (unpack sources and apply patches)"
msgstr ""
-#: rpm.c:470 rpmqv.c:573
+#: rpm.c:472 rpmqv.c:575
#, c-format
msgid "list check (do some cursory checks on %files)"
msgstr ""
-#: rpm.c:472 rpmqv.c:575
+#: rpm.c:474 rpmqv.c:577
msgid "compile (prep and compile)"
msgstr ""
-#: rpm.c:474 rpmqv.c:577
+#: rpm.c:476 rpmqv.c:579
msgid "install (prep, compile, install)"
msgstr ""
-#: rpm.c:476 rpmqv.c:579
+#: rpm.c:478 rpmqv.c:581
msgid "binary package (prep, compile, install, package)"
msgstr ""
-#: rpm.c:478 rpmqv.c:581
+#: rpm.c:480 rpmqv.c:583
msgid "bin/src package (prep, compile, install, package)"
msgstr ""
-#: lib/poptBT.c:155 rpm.c:480 rpmqv.c:585
+#: lib/poptBT.c:155 rpm.c:482 rpmqv.c:587
msgid "skip straight to specified stage (only for c,i)"
msgstr ""
-#: lib/poptBT.c:145 rpm.c:482 rpmqv.c:587
+#: lib/poptBT.c:145 rpm.c:484 rpmqv.c:589
msgid "remove build tree when done"
msgstr ""
-#: lib/poptBT.c:151 rpm.c:484 rpmqv.c:589
+#: lib/poptBT.c:151 rpm.c:486 rpmqv.c:591
msgid "remove sources when done"
msgstr ""
-#: rpm.c:486 rpmqv.c:591
+#: rpm.c:488 rpmqv.c:593
msgid "remove spec file when done"
msgstr ""
-#: rpm.c:488 rpmqv.c:593
+#: rpm.c:490 rpmqv.c:595
msgid "generate PGP/GPG signature"
msgstr ""
-#: rpm.c:489
+#: rpm.c:491
msgid " --buildroot <dir> "
msgstr ""
-#: rpm.c:490 rpmqv.c:595
+#: rpm.c:492 rpmqv.c:597
msgid "use <dir> as the build root"
msgstr ""
-#: rpm.c:491
+#: rpm.c:493
msgid " --target=<platform>+"
msgstr ""
-#: rpm.c:492 rpmqv.c:597
+#: rpm.c:494 rpmqv.c:599
msgid "build the packages for the build targets platform1...platformN."
msgstr ""
-#: rpm.c:494 rpmqv.c:599
+#: rpm.c:496 rpmqv.c:601
msgid "do not execute any stages"
msgstr ""
-#: rpm.c:495
+#: rpm.c:497
msgid " --timecheck <secs> "
msgstr ""
-#: rpm.c:496
+#: rpm.c:498
msgid "set the time check to <secs> seconds (0 disables)"
msgstr ""
-#: rpm.c:498
+#: rpm.c:500
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpm.c:499 rpmqv.c:602
+#: rpm.c:501 rpmqv.c:604
msgid ""
"install source package, build binary package and remove spec file, sources, "
"patches, and icons."
msgstr ""
-#: rpm.c:500
+#: rpm.c:502
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpm.c:501 rpmqv.c:604
+#: rpm.c:503 rpmqv.c:606
msgid "like --rebuild, but don't build any package"
msgstr ""
-#: rpm.c:504
+#: rpm.c:506
msgid " --resign <pkg>+ "
msgstr ""
-#: rpm.c:505 rpmqv.c:610
+#: rpm.c:507 rpmqv.c:612
msgid "sign a package (discard current signature)"
msgstr ""
-#: rpm.c:506
+#: rpm.c:508
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpm.c:507 rpmqv.c:612
+#: rpm.c:509 rpmqv.c:614
msgid "add a signature to a package"
msgstr ""
-#: rpm.c:508
+#: rpm.c:510
msgid " --checksig <pkg>+"
msgstr ""
-#: rpm.c:509
+#: rpm.c:511
msgid " -K <pkg>+ "
msgstr ""
-#: rpm.c:510 rpmqv.c:616
+#: rpm.c:512 rpmqv.c:618
msgid "verify package signature"
msgstr ""
-#: rpm.c:512 rpmqv.c:618
+#: rpm.c:514 rpmqv.c:620
msgid "skip any PGP signatures"
msgstr ""
-#: rpm.c:514 rpmqv.c:620
+#: rpm.c:516 rpmqv.c:622
msgid "skip any GPG signatures"
msgstr ""
-#: rpm.c:516 rpmqv.c:622
+#: rpm.c:518 rpmqv.c:624
msgid "skip any MD5 signatures"
msgstr ""
-#: rpm.c:520
+#: rpm.c:522
msgid "make sure a valid database exists"
msgstr ""
-#: rpm.c:522
+#: rpm.c:524
msgid "rebuild database from existing database"
msgstr ""
-#: rpm.c:530 rpmqv.c:485
+#: rpm.c:532 rpmqv.c:487
msgid ""
"set the file permissions to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:533 rpmqv.c:488
+#: rpm.c:535 rpmqv.c:490
msgid ""
"set the file owner and group to those in the package database using the same "
"package specification options as -q"
msgstr ""
-#: rpm.c:670 rpm.c:676 rpm.c:683 rpm.c:689 rpm.c:698 rpm.c:720 rpm.c:726
-#: rpm.c:760 rpm.c:768 rpm.c:789 rpm.c:846 rpmqv.c:806 rpmqv.c:815 rpmqv.c:821
-#: rpmqv.c:827 rpmqv.c:861 rpmqv.c:868 rpmqv.c:903 rpmqv.c:911 rpmqv.c:917
-#: rpmqv.c:925 rpmqv.c:987
+#: rpm.c:675 rpm.c:682 rpm.c:689 rpm.c:696 rpm.c:705 rpm.c:727 rpm.c:733
+#: rpm.c:769 rpm.c:777 rpm.c:798 rpm.c:855 rpmqv.c:811 rpmqv.c:820 rpmqv.c:826
+#: rpmqv.c:832 rpmqv.c:867 rpmqv.c:874 rpmqv.c:910 rpmqv.c:918 rpmqv.c:924
+#: rpmqv.c:932 rpmqv.c:994
msgid "only one major mode may be specified"
msgstr ""
-#: rpm.c:691 rpmqv.c:808
+#: rpm.c:698 rpmqv.c:813
msgid "-u and --uninstall are deprecated and no longer work.\n"
msgstr ""
-#: rpm.c:693 rpmqv.c:810
+#: rpm.c:700 rpmqv.c:815
msgid "Use -e or --erase instead.\n"
msgstr ""
-#: rpm.c:733 rpm.c:739 rpm.c:746 rpm.c:753 rpm.c:853 rpmqv.c:874 rpmqv.c:880
-#: rpmqv.c:887 rpmqv.c:894 rpmqv.c:1002
+#: rpm.c:741 rpm.c:747 rpm.c:754 rpm.c:761 rpm.c:862 rpmqv.c:880 rpmqv.c:886
+#: rpmqv.c:893 rpmqv.c:900 rpmqv.c:1009
msgid "one type of query/verify may be performed at a time"
msgstr ""
-#: rpm.c:795 rpmqv.c:845
+#: rpm.c:804 rpmqv.c:850
msgid "relocations must begin with a /"
msgstr ""
-#: rpm.c:797 rpmqv.c:847
+#: rpm.c:806 rpmqv.c:852
msgid "relocations must contain a ="
msgstr ""
-#: rpm.c:800 rpmqv.c:850
+#: rpm.c:809 rpmqv.c:855
msgid "relocations must have a / following the ="
msgstr ""
-#: rpm.c:809 rpmqv.c:834
+#: rpm.c:818 rpmqv.c:839
msgid "exclude paths must begin with a /"
msgstr ""
-#: rpm.c:818 rpmqv.c:946
+#: rpm.c:827 rpmqv.c:953
#, c-format
msgid "Internal error in argument processing (%d) :-(\n"
msgstr ""
-#: rpm.c:859 rpmqv.c:1007
+#: rpm.c:867 rpmqv.c:1013
msgid "unexpected query flags"
msgstr ""
-#: rpm.c:862 rpmqv.c:1010
+#: rpm.c:870 rpmqv.c:1016
msgid "unexpected query format"
msgstr ""
-#: rpm.c:865 rpmqv.c:1013
+#: rpm.c:873 rpmqv.c:1019
msgid "unexpected query source"
msgstr ""
-#: rpm.c:868 rpmqv.c:1033
+#: rpm.c:876 rpmqv.c:1039
msgid "only installation, upgrading, rmsource and rmspec may be forced"
msgstr ""
-#: rpm.c:871 rpmqv.c:1038
+#: rpm.c:879 rpmqv.c:1044
msgid "files may only be relocated during package installation"
msgstr ""
-#: rpm.c:874 rpmqv.c:1041
+#: rpm.c:882 rpmqv.c:1047
msgid "only one of --prefix or --relocate may be used"
msgstr ""
-#: rpm.c:877 rpmqv.c:1044
+#: rpm.c:885 rpmqv.c:1050
msgid ""
"--relocate and --excludepath may only be used when installing new packages"
msgstr ""
-#: rpm.c:880 rpmqv.c:1047
+#: rpm.c:888 rpmqv.c:1053
msgid "--prefix may only be used when installing new packages"
msgstr ""
-#: rpm.c:883 rpmqv.c:1050
+#: rpm.c:891 rpmqv.c:1056
msgid "arguments to --prefix must begin with a /"
msgstr ""
-#: rpm.c:886 rpmqv.c:1053
+#: rpm.c:894 rpmqv.c:1059
msgid "--hash (-h) may only be specified during package installation"
msgstr ""
-#: rpm.c:890 rpmqv.c:1057
+#: rpm.c:898 rpmqv.c:1063
msgid "--percent may only be specified during package installation"
msgstr ""
-#: rpm.c:894 rpmqv.c:1061
+#: rpm.c:902 rpmqv.c:1067
msgid "--replacefiles may only be specified during package installation"
msgstr ""
-#: rpm.c:898 rpmqv.c:1065
+#: rpm.c:906 rpmqv.c:1071
msgid "--replacepkgs may only be specified during package installation"
msgstr ""
-#: rpm.c:902 rpmqv.c:1069
+#: rpm.c:910 rpmqv.c:1075
msgid "--excludedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:906 rpmqv.c:1073
+#: rpm.c:914 rpmqv.c:1079
msgid "--includedocs may only be specified during package installation"
msgstr ""
-#: rpm.c:910 rpmqv.c:1077
+#: rpm.c:918 rpmqv.c:1083
msgid "only one of --excludedocs and --includedocs may be specified"
msgstr ""
-#: rpm.c:914 rpmqv.c:1081
+#: rpm.c:922 rpmqv.c:1087
msgid "--ignorearch may only be specified during package installation"
msgstr ""
-#: rpm.c:918 rpmqv.c:1085
+#: rpm.c:926 rpmqv.c:1091
msgid "--ignoreos may only be specified during package installation"
msgstr ""
-#: rpm.c:922 rpmqv.c:1089
+#: rpm.c:930 rpmqv.c:1095
msgid "--ignoresize may only be specified during package installation"
msgstr ""
-#: rpm.c:926 rpmqv.c:1093
+#: rpm.c:934 rpmqv.c:1099
msgid "--allmatches may only be specified during package erasure"
msgstr ""
-#: rpm.c:930 rpmqv.c:1097
+#: rpm.c:938 rpmqv.c:1103
msgid "--allfiles may only be specified during package installation"
msgstr ""
-#: rpm.c:934 rpmqv.c:1101
+#: rpm.c:942 rpmqv.c:1107
msgid "--justdb may only be specified during package installation and erasure"
msgstr ""
-#: rpm.c:939 rpmqv.c:1108
+#: rpm.c:947 rpmqv.c:1114
msgid ""
"--noscripts may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:943
+#: rpm.c:951
msgid ""
"--notriggers may only be specified during package installation, erasure, and "
"verification"
msgstr ""
-#: rpm.c:947 rpmqv.c:1120
+#: rpm.c:955 rpmqv.c:1126
msgid ""
"--nodeps may only be specified during package building, rebuilding, "
"recompilation, installation,erasure, and verification"
msgstr ""
-#: rpm.c:952 rpmqv.c:1125
+#: rpm.c:960 rpmqv.c:1131
msgid ""
"--test may only be specified during package installation, erasure, and "
"building"
msgstr ""
-#: rpm.c:956 rpmqv.c:1130
+#: rpm.c:964 rpmqv.c:1136
msgid ""
"--root (-r) may only be specified during installation, erasure, querying, "
"and database rebuilds"
msgstr ""
-#: rpm.c:968 rpmqv.c:1142
+#: rpm.c:976 rpmqv.c:1148
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
-#: rpm.c:974 rpmqv.c:1149
+#: rpm.c:982 rpmqv.c:1155
msgid "--oldpackage may only be used during upgrades"
msgstr ""
-#: rpm.c:977 rpmqv.c:1154
+#: rpm.c:985 rpmqv.c:1160
msgid "--nopgp may only be used during signature checking"
msgstr ""
-#: rpm.c:980 rpmqv.c:1157
+#: rpm.c:988 rpmqv.c:1163
msgid "--nogpg may only be used during signature checking"
msgstr ""
-#: rpm.c:983 rpmqv.c:1162
+#: rpm.c:991 rpmqv.c:1168
msgid ""
"--nomd5 may only be used during signature checking and package verification"
msgstr ""
-#: rpm.c:994 rpmqv.c:1175
+#: rpm.c:1002 rpmqv.c:1181
msgid "no files to sign\n"
msgstr ""
-#: rpm.c:999 rpmqv.c:1180
+#: rpm.c:1007 rpmqv.c:1186
#, c-format
msgid "cannot access file %s\n"
msgstr ""
-#: rpm.c:1014 rpmqv.c:1196
+#: rpm.c:1022 rpmqv.c:1202
msgid "pgp not found: "
msgstr ""
-#: rpm.c:1018 rpmqv.c:1200
+#: rpm.c:1026 rpmqv.c:1206
msgid "Enter pass phrase: "
msgstr ""
-#: rpm.c:1020 rpmqv.c:1202
+#: rpm.c:1028 rpmqv.c:1208
msgid "Pass phrase check failed\n"
msgstr ""
-#: rpm.c:1023 rpmqv.c:1205
+#: rpm.c:1031 rpmqv.c:1211
msgid "Pass phrase is good.\n"
msgstr ""
-#: rpm.c:1028 rpmqv.c:1210
+#: rpm.c:1036 rpmqv.c:1216
msgid "Invalid %%_signature spec in macro file.\n"
msgstr ""
-#: rpm.c:1034 rpmqv.c:1216
+#: rpm.c:1042 rpmqv.c:1222
msgid "--sign may only be used during package building"
msgstr ""
-#: rpm.c:1049 rpmqv.c:1232
+#: rpm.c:1057 rpmqv.c:1238
msgid "exec failed\n"
msgstr ""
-#: rpm.c:1068 rpmqv.c:1501
+#: rpm.c:1076 rpmqv.c:1507
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpm.c:1079 rpmqv.c:1523
+#: rpm.c:1087 rpmqv.c:1529
msgid "no packages given for signature check"
msgstr ""
-#: rpm.c:1090 rpmqv.c:1534
+#: rpm.c:1098 rpmqv.c:1540
msgid "no packages given for signing"
msgstr ""
-#: rpm.c:1106 rpmqv.c:1374
+#: rpm.c:1114 rpmqv.c:1380
msgid "no packages given for uninstall"
msgstr ""
-#: rpm.c:1156 rpmqv.c:1424
+#: rpm.c:1164 rpmqv.c:1430
msgid "no packages given for install"
msgstr ""
-#: rpm.c:1179 rpmqv.c:1464
+#: rpm.c:1187 rpmqv.c:1470
msgid "extra arguments given for query of all packages"
msgstr ""
-#: rpm.c:1184 rpmqv.c:1469
+#: rpm.c:1192 rpmqv.c:1475
msgid "no arguments given for query"
msgstr ""
-#: rpm.c:1201 rpmqv.c:1489
+#: rpm.c:1209 rpmqv.c:1495
msgid "extra arguments given for verify of all packages"
msgstr ""
-#: rpm.c:1205 rpmqv.c:1493
+#: rpm.c:1213 rpmqv.c:1499
msgid "no arguments given for verify"
msgstr ""
@@ -1162,356 +1162,356 @@ msgstr ""
msgid "cannot re-open payload: %s\n"
msgstr ""
-#: rpmqv.c:284
+#: rpmqv.c:286
#, c-format
msgid "Usage: %s {--help}\n"
msgstr ""
-#: rpmqv.c:285
+#: rpmqv.c:287
#, c-format
msgid " %s {--version}\n"
msgstr ""
-#: rpmqv.c:288
+#: rpmqv.c:290
#, c-format
msgid " %s {--initdb} [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:289
+#: rpmqv.c:291
#, c-format
msgid " %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
msgstr ""
-#: rpmqv.c:293
+#: rpmqv.c:295
#, c-format
msgid ""
" %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:303
+#: rpmqv.c:305
#, c-format
msgid ""
" %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"
msgstr ""
-#: rpmqv.c:313
+#: rpmqv.c:315
#, c-format
msgid " %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
msgstr ""
-#: rpmqv.c:319
+#: rpmqv.c:321
#, c-format
msgid " %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"
msgstr ""
-#: rpmqv.c:326
+#: rpmqv.c:328
#, c-format
msgid " %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
msgstr ""
-#: rpmqv.c:329
+#: rpmqv.c:331
#, c-format
msgid " %s {--querytags}\n"
msgstr ""
-#: rpmqv.c:330
+#: rpmqv.c:332
#, c-format
msgid " %s {--setperms} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:331
+#: rpmqv.c:333
#, c-format
msgid " %s {--setugids} [-afpg] [target]\n"
msgstr ""
-#: rpmqv.c:335
+#: rpmqv.c:337
#, c-format
msgid ""
" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
"<file>]\n"
msgstr ""
-#: rpmqv.c:336
+#: rpmqv.c:338
msgid " [--sign] [--nobuild] ]"
msgstr ""
-#: rpmqv.c:339
+#: rpmqv.c:341
#, c-format
msgid " %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
msgstr ""
-#: rpmqv.c:340
+#: rpmqv.c:342
#, c-format
msgid ""
" %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:341
+#: rpmqv.c:343
#, c-format
msgid ""
" %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
msgstr ""
-#: rpmqv.c:342
+#: rpmqv.c:344
#, c-format
msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n"
msgstr ""
-#: rpmqv.c:346
+#: rpmqv.c:348
#, c-format
msgid " %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
msgstr ""
-#: rpmqv.c:347
+#: rpmqv.c:349
#, c-format
msgid " %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
msgstr ""
-#: rpmqv.c:348
+#: rpmqv.c:350
#, c-format
msgid ""
" %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
msgstr ""
-#: rpmqv.c:392
+#: rpmqv.c:394
msgid " All modes support the following options:"
msgstr ""
-#: rpmqv.c:393
+#: rpmqv.c:395
msgid " --define '<name> <body>'"
msgstr ""
-#: rpmqv.c:395
+#: rpmqv.c:397
msgid " --eval '<name>+' "
msgstr ""
-#: rpmqv.c:397
+#: rpmqv.c:399
msgid " --pipe <cmd> "
msgstr ""
-#: rpmqv.c:399
+#: rpmqv.c:401
msgid " --rcfile <file> "
msgstr ""
-#: rpmqv.c:404
+#: rpmqv.c:406
msgid " --dbpath <dir> "
msgstr ""
-#: rpmqv.c:406
+#: rpmqv.c:408
msgid " --root <dir> "
msgstr ""
-#: rpmqv.c:416
+#: rpmqv.c:418
msgid ""
" Install, upgrade and query (with -p) modes allow URL's to be used in place"
msgstr ""
-#: rpmqv.c:417
+#: rpmqv.c:419
msgid " of file names as well as the following options:"
msgstr ""
-#: rpmqv.c:418
+#: rpmqv.c:420
msgid " --ftpproxy <host> "
msgstr ""
-#: rpmqv.c:420
+#: rpmqv.c:422
msgid " --ftpport <port> "
msgstr ""
-#: rpmqv.c:422
+#: rpmqv.c:424
msgid " --httpproxy <host> "
msgstr ""
-#: rpmqv.c:424
+#: rpmqv.c:426
msgid " --httpport <port> "
msgstr ""
-#: rpmqv.c:430
+#: rpmqv.c:432
msgid " Package specification options:"
msgstr ""
-#: rpmqv.c:432
+#: lib/poptQV.c:63 rpmqv.c:434
msgid "query/verify all packages"
msgstr ""
-#: rpmqv.c:433
+#: rpmqv.c:435
msgid " -f <file>+ "
msgstr ""
-#: rpmqv.c:434
+#: rpmqv.c:436
msgid "query/verify package owning <file>"
msgstr ""
-#: rpmqv.c:435
+#: rpmqv.c:437
msgid " -p <packagefile>+ "
msgstr ""
-#: rpmqv.c:436
+#: rpmqv.c:438
msgid "query/verify (uninstalled) package <packagefile>"
msgstr ""
-#: rpmqv.c:437
+#: rpmqv.c:439
msgid " --triggeredby <pkg> "
msgstr ""
-#: rpmqv.c:438
+#: rpmqv.c:440
msgid "query/verify packages triggered by <pkg>"
msgstr ""
-#: rpmqv.c:439
+#: rpmqv.c:441
msgid " --whatprovides <cap> "
msgstr ""
-#: rpmqv.c:440
+#: rpmqv.c:442
msgid "query/verify packages which provide <cap> capability"
msgstr ""
-#: rpmqv.c:441
+#: rpmqv.c:443
msgid " --whatrequires <cap> "
msgstr ""
-#: rpmqv.c:442
+#: rpmqv.c:444
msgid "query/verify packages which require <cap> capability"
msgstr ""
-#: rpmqv.c:446
+#: rpmqv.c:448
msgid " --queryformat <qfmt> "
msgstr ""
-#: rpmqv.c:449
+#: rpmqv.c:451
msgid " Information selection options:"
msgstr ""
-#: rpmqv.c:465
+#: rpmqv.c:467
msgid "list capabilities provided by package"
msgstr ""
-#: rpmqv.c:467
+#: rpmqv.c:469
msgid "list capabilities required by package"
msgstr ""
-#: rpmqv.c:469
+#: rpmqv.c:471
msgid "print the various [un]install scriptlets"
msgstr ""
-#: rpmqv.c:471
+#: rpmqv.c:473
msgid "show the trigger scriptlets contained in the package"
msgstr ""
-#: rpmqv.c:495
+#: rpmqv.c:497
msgid " --install <packagefile>"
msgstr ""
-#: rpmqv.c:496
+#: rpmqv.c:498
msgid " -i <packagefile> "
msgstr ""
-#: rpmqv.c:505
+#: rpmqv.c:507
msgid " --excludepath <path> "
msgstr ""
-#: rpmqv.c:506
+#: rpmqv.c:508
msgid "skip files with leading component <path> "
msgstr ""
-#: rpmqv.c:526
+#: rpmqv.c:528
msgid "don't execute any installation scriptlets"
msgstr ""
-#: rpmqv.c:528
+#: rpmqv.c:530
msgid "don't execute any scriptlets triggered by this package"
msgstr ""
-#: rpmqv.c:531
+#: rpmqv.c:533
msgid " --prefix <dir> "
msgstr ""
-#: rpmqv.c:533
+#: rpmqv.c:535
msgid " --relocate <oldpath>=<newpath>"
msgstr ""
-#: rpmqv.c:542
+#: rpmqv.c:544
msgid " --upgrade <packagefile>"
msgstr ""
-#: rpmqv.c:543
+#: rpmqv.c:545
msgid " -U <packagefile> "
msgstr ""
-#: rpmqv.c:548
+#: rpmqv.c:550
msgid " --erase <package>"
msgstr ""
-#: rpmqv.c:567
+#: rpmqv.c:569
msgid " -b<stage> <spec> "
msgstr ""
-#: rpmqv.c:568
+#: rpmqv.c:570
msgid " -t<stage> <tarball> "
msgstr ""
-#: rpmqv.c:583
+#: rpmqv.c:585
msgid "package src rpm only"
msgstr ""
-#: rpmqv.c:594
+#: rpmqv.c:596
msgid " --buildroot <dir> "
msgstr ""
-#: rpmqv.c:596
+#: rpmqv.c:598
msgid " --target=<platform>+ "
msgstr ""
-#: rpmqv.c:601
+#: rpmqv.c:603
msgid " --rebuild <src_pkg> "
msgstr ""
-#: rpmqv.c:603
+#: rpmqv.c:605
msgid " --recompile <src_pkg> "
msgstr ""
-#: rpmqv.c:609
+#: rpmqv.c:611
msgid " --resign <pkg>+ "
msgstr ""
-#: rpmqv.c:611
+#: rpmqv.c:613
msgid " --addsign <pkg>+ "
msgstr ""
-#: rpmqv.c:614
+#: rpmqv.c:616
msgid " --checksig <pkg>+"
msgstr ""
-#: rpmqv.c:615
+#: rpmqv.c:617
msgid " -K <pkg>+ "
msgstr ""
-#: rpmqv.c:628
+#: rpmqv.c:630
msgid "initalize database (unnecessary, legacy use)"
msgstr ""
-#: rpmqv.c:630
+#: rpmqv.c:632
msgid "rebuild database indices from existing database headers"
msgstr ""
-#: rpmqv.c:1017
+#: rpmqv.c:1023
msgid "--dbpath given for operation that does not use a database"
msgstr ""
-#: rpmqv.c:1114
+#: rpmqv.c:1120
msgid ""
"--notriggers may only be specified during package installation and erasure"
msgstr ""
-#: rpmqv.c:1272
+#: rpmqv.c:1278
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1342
+#: rpmqv.c:1348
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1344
+#: rpmqv.c:1350
msgid "no tar files given for build"
msgstr ""
@@ -2397,11 +2397,11 @@ msgstr ""
msgid "cannot get %s lock on database"
msgstr ""
-#: lib/db1.c:447 lib/db3.c:1078
+#: lib/db1.c:447 lib/db3.c:1089
msgid "exclusive"
msgstr ""
-#: lib/db1.c:447 lib/db3.c:1078
+#: lib/db1.c:447 lib/db3.c:1089
msgid "shared"
msgstr ""
@@ -2450,37 +2450,37 @@ msgstr ""
msgid "%s has too large or too small integer value, skipped\n"
msgstr ""
-#: lib/db3.c:461
+#: lib/db3.c:460
#, c-format
msgid "closed db environment %s/%s\n"
msgstr ""
-#: lib/db3.c:473
+#: lib/db3.c:476
#, c-format
msgid "removed db environment %s/%s\n"
msgstr ""
-#: lib/db3.c:510
+#: lib/db3.c:513
#, c-format
msgid "opening db environment %s/%s %s\n"
msgstr ""
-#: lib/db3.c:881
+#: lib/db3.c:892
#, c-format
msgid "closed db index %s/%s\n"
msgstr ""
-#: lib/db3.c:971
+#: lib/db3.c:982
#, c-format
msgid "opening db index %s/%s %s mode=0x%x\n"
msgstr ""
-#: lib/db3.c:1076
+#: lib/db3.c:1087
#, c-format
msgid "cannot get %s lock on %s/%s\n"
msgstr ""
-#: lib/db3.c:1083
+#: lib/db3.c:1094
#, c-format
msgid "locked db index %s/%s\n"
msgstr ""
@@ -2828,79 +2828,79 @@ msgstr ""
msgid "lookup I18N strings in specfile catalog"
msgstr ""
-#: lib/poptQV.c:62
-msgid "query package owning file"
+#: lib/poptQV.c:65
+msgid "query/verify package owning file"
msgstr ""
-#: lib/poptQV.c:64
-msgid "query packages in group"
+#: lib/poptQV.c:67
+msgid "query/verify packages in group"
msgstr ""
-#: lib/poptQV.c:66
-msgid "query a package file"
+#: lib/poptQV.c:69
+msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:68
+#: lib/poptQV.c:71
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:72
+#: lib/poptQV.c:75
msgid "display known query tags"
msgstr ""
-#: lib/poptQV.c:74
+#: lib/poptQV.c:77
msgid "query a spec file"
msgstr ""
-#: lib/poptQV.c:76
+#: lib/poptQV.c:79
msgid "query the pacakges triggered by the package"
msgstr ""
-#: lib/poptQV.c:78
+#: lib/poptQV.c:81
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:80
+#: lib/poptQV.c:83
msgid "rpm verify mode (legacy)"
msgstr ""
-#: lib/poptQV.c:82
+#: lib/poptQV.c:85
msgid "query the packages which require a capability"
msgstr ""
-#: lib/poptQV.c:84
+#: lib/poptQV.c:87
msgid "query the packages which provide a capability"
msgstr ""
-#: lib/poptQV.c:124
+#: lib/poptQV.c:127
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:126
+#: lib/poptQV.c:129
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:128
+#: lib/poptQV.c:131
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:130
+#: lib/poptQV.c:133
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:134
+#: lib/poptQV.c:137
msgid "use the following query format"
msgstr ""
-#: lib/poptQV.c:136
+#: lib/poptQV.c:139
msgid "substitute i18n sections into spec file"
msgstr ""
-#: lib/poptQV.c:138
+#: lib/poptQV.c:141
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:140
+#: lib/poptQV.c:143
msgid "display a verbose file listing"
msgstr ""
@@ -3004,80 +3004,80 @@ msgid "can't query %s: %s\n"
msgstr ""
#. XXX Fstrerror
-#: lib/query.c:493
+#: lib/query.c:494
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
-#: lib/query.c:511
+#: lib/query.c:512
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:520 lib/rpminstall.c:231
+#: lib/query.c:521 lib/rpminstall.c:231
#, c-format
msgid "%s does not appear to be a RPM package\n"
msgstr ""
-#: lib/query.c:524
+#: lib/query.c:525
#, c-format
msgid "query of %s failed\n"
msgstr ""
-#: lib/query.c:557
+#: lib/query.c:558
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
-#: lib/query.c:580
+#: lib/query.c:582
msgid "no packages\n"
msgstr ""
-#: lib/query.c:590
+#: lib/query.c:592
#, c-format
msgid "group %s does not contain any packages\n"
msgstr ""
-#: lib/query.c:600
+#: lib/query.c:602
#, c-format
msgid "no package triggers %s\n"
msgstr ""
-#: lib/query.c:610
+#: lib/query.c:612
#, c-format
msgid "no package requires %s\n"
msgstr ""
-#: lib/query.c:621
+#: lib/query.c:623
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:637
+#: lib/query.c:639
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:640
+#: lib/query.c:642
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:665
+#: lib/query.c:667
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:668
+#: lib/query.c:670
#, c-format
msgid "package record number: %u\n"
msgstr ""
-#: lib/query.c:672
+#: lib/query.c:674
#, c-format
msgid "record %d could not be read\n"
msgstr ""
-#: lib/query.c:683 lib/rpminstall.c:435
+#: lib/query.c:685 lib/rpminstall.c:435
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -3221,7 +3221,7 @@ msgstr ""
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:695 lib/rpmdb.c:2200
+#: lib/rpmdb.c:695 lib/rpmdb.c:2179
msgid "no dbpath has been set"
msgstr ""
@@ -3237,110 +3237,110 @@ msgstr ""
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1054 lib/rpmdb.c:1574 lib/uninstall.c:90
+#: lib/rpmdb.c:1054 lib/rpmdb.c:1557 lib/uninstall.c:90
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1625
+#: lib/rpmdb.c:1608
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1636
+#: lib/rpmdb.c:1619
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1645
+#: lib/rpmdb.c:1628
#, c-format
msgid "removing %d entries from %s index:\n"
msgstr ""
-#: lib/rpmdb.c:1652 lib/rpmdb.c:1875
+#: lib/rpmdb.c:1635 lib/rpmdb.c:1854
#, c-format
msgid "%6d %s\n"
msgstr ""
-#: lib/rpmdb.c:1788
+#: lib/rpmdb.c:1767
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1843
+#: lib/rpmdb.c:1822
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1859
+#: lib/rpmdb.c:1838
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1868
+#: lib/rpmdb.c:1847
#, c-format
msgid "adding %d entries to %s index:\n"
msgstr ""
-#: lib/rpmdb.c:2225
+#: lib/rpmdb.c:2204
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2229
+#: lib/rpmdb.c:2208
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2235
+#: lib/rpmdb.c:2214
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2237
+#: lib/rpmdb.c:2216
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2244
+#: lib/rpmdb.c:2223
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2253
+#: lib/rpmdb.c:2232
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2276
+#: lib/rpmdb.c:2255
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2287
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2326
+#: lib/rpmdb.c:2305
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2313
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2336
+#: lib/rpmdb.c:2315
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2346
+#: lib/rpmdb.c:2325
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2348
+#: lib/rpmdb.c:2327
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/python/Makefile.in b/python/Makefile.in
index 92dae898a..c0ccc72e5 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -155,6 +155,9 @@ __SSH = @__SSH@
__STRIP = @__STRIP@
__TAR = @__TAR@
l = @l@
+libdb1 = @libdb1@
+libdb2 = @libdb2@
+libdb3 = @libdb3@
testdir = @testdir@
tmpdir = @tmpdir@
varprefix = @varprefix@
@@ -334,7 +337,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/rpm.c b/rpm.c
index e9fb78054..bf22392d1 100755
--- a/rpm.c
+++ b/rpm.c
@@ -100,7 +100,9 @@ extern struct rpmBuildArguments rpmBTArgs;
static struct poptOption optionsTable[] = {
{ "addsign", '\0', 0, 0, GETOPT_ADDSIGN, NULL, NULL},
/* all and allmatches both using 'a' is dumb */
+#ifdef DYING
{ "all", 'a', 0, 0, 'a', NULL, NULL},
+#endif
{ "allfiles", '\0', 0, &allFiles, 0, NULL, NULL},
{ "allmatches", '\0', 0, &allMatches, 0, NULL, NULL},
{ "badreloc", '\0', 0, &badReloc, 0, NULL, NULL},
@@ -539,7 +541,9 @@ int main(int argc, const char ** argv)
{
enum modes bigMode = MODE_UNKNOWN;
QVA_t *qva = &rpmQVArgs;
+#ifdef DYING
enum rpmQVSources QVSource = RPMQV_PACKAGE;
+#endif
int arg;
int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0;
int verifyFlags;
@@ -658,6 +662,7 @@ int main(int argc, const char ** argv)
if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
memset(qva, 0, sizeof(*qva));
+ qva->qva_source = RPMQV_PACKAGE;
qva->qva_mode = ' ';
qva->qva_char = ' ';
@@ -671,6 +676,7 @@ int main(int argc, const char ** argv)
bigMode = MODE_CHECKSIG;
break;
+#ifdef DYING
case 'q':
if (bigMode != MODE_UNKNOWN && bigMode != MODE_QUERY)
argerror(_("only one major mode may be specified"));
@@ -683,6 +689,7 @@ int main(int argc, const char ** argv)
argerror(_("only one major mode may be specified"));
bigMode = MODE_VERIFY;
break;
+#endif
case 'u':
if (bigMode != MODE_UNKNOWN && bigMode != MODE_UNINSTALL)
@@ -728,6 +735,7 @@ int main(int argc, const char ** argv)
upgrade = 1;
break;
+#ifdef DYING
case 'p':
if (QVSource != RPMQV_PACKAGE && QVSource != RPMQV_RPM)
argerror(_("one type of query/verify may be performed at a " "time"));
@@ -754,6 +762,7 @@ int main(int argc, const char ** argv)
"time"));
QVSource = RPMQV_ALL;
break;
+#endif
case GETOPT_RESIGN:
if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN)
@@ -849,10 +858,9 @@ int main(int argc, const char ** argv)
}
if (qva->qva_sourceCount) {
- if (QVSource != RPMQV_PACKAGE || qva->qva_sourceCount > 1)
+ if (qva->qva_sourceCount > 1)
argerror(_("one type of query/verify may be performed at a "
"time"));
- QVSource = qva->qva_source;
}
if (qva->qva_flags && (bigMode & ~MODES_QV))
@@ -861,7 +869,7 @@ int main(int argc, const char ** argv)
if (qva->qva_queryFormat && (bigMode & ~MODES_QV))
argerror(_("unexpected query format"));
- if (QVSource != RPMQV_PACKAGE && (bigMode & ~MODES_QV))
+ if (qva->qva_source != RPMQV_PACKAGE && (bigMode & ~MODES_QV))
argerror(_("unexpected query source"));
if (!(bigMode == MODE_INSTALL) && force)
@@ -1174,7 +1182,7 @@ int main(int argc, const char ** argv)
case MODE_QUERY:
qva->qva_prefix = rootdir;
- if (QVSource == RPMQV_ALL) {
+ if (qva->qva_source == RPMQV_ALL) {
if (poptPeekArg(optCon))
argerror(_("extra arguments given for query of all packages"));
@@ -1183,7 +1191,7 @@ int main(int argc, const char ** argv)
if (!poptPeekArg(optCon))
argerror(_("no arguments given for query"));
while ((pkg = poptGetArg(optCon)))
- ec += rpmQuery(qva, QVSource, pkg);
+ ec += rpmQuery(qva, qva->qva_source, pkg);
}
break;
@@ -1196,7 +1204,7 @@ int main(int argc, const char ** argv)
qva->qva_prefix = rootdir;
qva->qva_flags = verifyFlags;
- if (QVSource == RPMQV_ALL) {
+ if (qva->qva_source == RPMQV_ALL) {
if (poptPeekArg(optCon))
argerror(_("extra arguments given for verify of all packages"));
ec = rpmVerify(qva, RPMQV_ALL, NULL);
@@ -1204,7 +1212,7 @@ int main(int argc, const char ** argv)
if (!poptPeekArg(optCon))
argerror(_("no arguments given for verify"));
while ((pkg = poptGetArg(optCon)))
- ec += rpmVerify(qva, QVSource, pkg);
+ ec += rpmVerify(qva, qva->qva_source, pkg);
}
break;
}
diff --git a/rpmqv.c b/rpmqv.c
index 3024e127f..129c4225c 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -165,7 +165,9 @@ static struct poptOption optionsTable[] = {
#endif
/* XXX colliding options */
+#ifdef DYING
{ "all", 'a', 0, 0, 'a', NULL, NULL},
+#endif
#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
{ NULL, 'i', 0, 0, 'i', NULL, NULL},
#endif
@@ -638,8 +640,10 @@ int main(int argc, const char ** argv)
#ifdef IAM_RPMQV
QVA_t *qva = &rpmQVArgs;
+#ifdef DYING
enum rpmQVSources QVSource = RPMQV_PACKAGE;
#endif
+#endif
#ifdef IAM_RPMBT
struct rpmBuildArguments *ba = &rpmBTArgs;
@@ -760,6 +764,7 @@ int main(int argc, const char ** argv)
#ifdef IAM_RPMQV
if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
memset(qva, 0, sizeof(*qva));
+ qva->qva_source = RPMQV_PACKAGE;
qva->qva_mode = ' ';
qva->qva_char = ' ';
#endif
@@ -855,6 +860,7 @@ int main(int argc, const char ** argv)
} break;
#endif /* IAM_RPMEIU */
+#ifdef DYING
#ifdef IAM_RPMQV
case 'q':
if (bigMode != MODE_UNKNOWN && bigMode != MODE_QUERY)
@@ -896,6 +902,7 @@ int main(int argc, const char ** argv)
QVSource = RPMQV_ALL;
break;
#endif /* IAM_RPMQV */
+#endif
#ifdef IAM_RPMDB
case GETOPT_REBUILDDB:
@@ -998,10 +1005,9 @@ int main(int argc, const char ** argv)
}
if (qva->qva_sourceCount) {
- if (QVSource != RPMQV_PACKAGE || qva->qva_sourceCount > 1)
+ if (qva->qva_sourceCount > 1)
argerror(_("one type of query/verify may be performed at a "
"time"));
- QVSource = qva->qva_source;
}
if (qva->qva_flags && (bigMode & ~MODES_QV))
argerror(_("unexpected query flags"));
@@ -1009,7 +1015,7 @@ int main(int argc, const char ** argv)
if (qva->qva_queryFormat && (bigMode & ~MODES_QV))
argerror(_("unexpected query format"));
- if (QVSource != RPMQV_PACKAGE && (bigMode & ~MODES_QV))
+ if (qva->qva_source != RPMQV_PACKAGE && (bigMode & ~MODES_QV))
argerror(_("unexpected query source"));
#endif
@@ -1459,7 +1465,7 @@ int main(int argc, const char ** argv)
{ const char * pkg;
qva->qva_prefix = rootdir;
- if (QVSource == RPMQV_ALL) {
+ if (qva->qva_source == RPMQV_ALL) {
if (poptPeekArg(optCon))
argerror(_("extra arguments given for query of all packages"));
@@ -1468,7 +1474,7 @@ int main(int argc, const char ** argv)
if (!poptPeekArg(optCon))
argerror(_("no arguments given for query"));
while ((pkg = poptGetArg(optCon)))
- ec += rpmQuery(qva, QVSource, pkg);
+ ec += rpmQuery(qva, qva->qva_source, pkg);
}
} break;
@@ -1484,7 +1490,7 @@ int main(int argc, const char ** argv)
qva->qva_prefix = rootdir;
qva->qva_flags = verifyFlags;
- if (QVSource == RPMQV_ALL) {
+ if (qva->qva_source == RPMQV_ALL) {
if (poptPeekArg(optCon))
argerror(_("extra arguments given for verify of all packages"));
ec = rpmVerify(qva, RPMQV_ALL, NULL);
@@ -1492,7 +1498,7 @@ int main(int argc, const char ** argv)
if (!poptPeekArg(optCon))
argerror(_("no arguments given for verify"));
while ((pkg = poptGetArg(optCon)))
- ec += rpmVerify(qva, QVSource, pkg);
+ ec += rpmVerify(qva, qva->qva_source, pkg);
}
} break;
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 7fd9186cf..4cf2209e4 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -155,6 +155,9 @@ __SSH = @__SSH@
__STRIP = @__STRIP@
__TAR = @__TAR@
l = @l@
+libdb1 = @libdb1@
+libdb2 = @libdb2@
+libdb3 = @libdb3@
testdir = @testdir@
tmpdir = @tmpdir@
varprefix = @varprefix@
@@ -228,7 +231,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 15:06:10 +0000