From 5807d4262ea2783d1a69becefeaf7d294d1d27b3 Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 26 May 2000 18:51:11 +0000 Subject: [PATCH] Remove build modes from rpm, use rpmb and/or popt glue instead. CVS patchset: 3754 CVS date: 2000/05/26 18:51:11 --- Makefile.am | 2 +- build.c | 88 +++++-- build.h | 1 + doc/rpm.8 | 3 +- lib/query.c | 51 ++-- lib/rpmdb.c | 4 +- lib/rpmlib.h | 2 + po/rpm.pot | 729 ++++++++++++++++++++++++++++--------------------------- popt/po/popt.pot | 2 +- rpm.c | 293 ++-------------------- rpm.spec | 1 - rpmpopt.in | 25 +- rpmqv.c | 177 ++++---------- 13 files changed, 580 insertions(+), 798 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9d138ba..d3d7e1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \ noinst_HEADERS = \ acconfig.h build.h system.h -rpm_SOURCES = build.c rpm.c +rpm_SOURCES = rpm.c rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS) rpm_LDADD = $(myLDADD) diff --git a/build.c b/build.c index bef9776..4fe310d 100644 --- a/build.c +++ b/build.c @@ -319,13 +319,28 @@ exit: #define POPT_RMSOURCE 1002 #define POPT_RMBUILD 1003 #define POPT_BUILDROOT 1004 -#define POPT_BUILDARCH 1005 -#define POPT_BUILDOS 1006 #define POPT_TARGETPLATFORM 1007 #define POPT_NOBUILD 1008 #define POPT_SHORTCIRCUIT 1009 #define POPT_RMSPEC 1010 +#define POPT_REBUILD 0x4220 +#define POPT_RECOMPILE 0x4320 +#define POPT_BA 0x6261 +#define POPT_BB 0x6262 +#define POPT_BC 0x6263 +#define POPT_BI 0x6269 +#define POPT_BL 0x626c +#define POPT_BP 0x6270 +#define POPT_BS 0x6273 +#define POPT_TA 0x7461 +#define POPT_TB 0x7462 +#define POPT_TC 0x7463 +#define POPT_TI 0x7469 +#define POPT_TL 0x746c +#define POPT_TP 0x7470 +#define POPT_TS 0x7473 + extern int noLang; static int noBuild = 0; static int useCatalog = 0; @@ -337,6 +352,27 @@ static void buildArgCallback( /*@unused@*/ poptContext con, struct rpmBuildArguments * rba = (struct rpmBuildArguments *) data; switch (opt->val) { + case POPT_REBUILD: + case POPT_RECOMPILE: + case POPT_BA: + case POPT_BB: + case POPT_BC: + case POPT_BI: + case POPT_BL: + case POPT_BP: + case POPT_BS: + case POPT_TA: + case POPT_TB: + case POPT_TC: + case POPT_TI: + case POPT_TL: + case POPT_TP: + case POPT_TS: + if (rba->buildMode == ' ') { + rba->buildMode = (opt->val >> 8) & 0xff; + rba->buildChar = (opt->val ) & 0xff; + } + break; case POPT_USECATALOG: rba->useCatalog = 1; break; case POPT_NOBUILD: rba->noBuild = 1; break; case POPT_NOLANG: rba->noLang = 1; break; @@ -352,14 +388,6 @@ static void buildArgCallback( /*@unused@*/ poptContext con, } rba->buildRootOverride = xstrdup(arg); break; - case POPT_BUILDARCH: - fprintf(stderr, _("--buildarch has been obsoleted. Use the --target option instead.\n")); - exit(EXIT_FAILURE); - /*@notreached@*/ break; - case POPT_BUILDOS: - fprintf(stderr, _("--buildos has been obsoleted. Use the --target option instead.\n")); - exit(EXIT_FAILURE); - /*@notreached@*/ break; case POPT_TARGETPLATFORM: if (rba->targets) { int len = strlen(rba->targets) + 1 + strlen(arg) + 1; @@ -378,10 +406,42 @@ static void buildArgCallback( /*@unused@*/ poptContext con, struct poptOption rpmBuildPoptTable[] = { { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, buildArgCallback, 0, NULL, NULL }, - { "buildarch", '\0', POPT_ARG_STRING, 0, POPT_BUILDARCH, - N_("override build architecture"), "ARCH" }, - { "buildos", '\0', POPT_ARG_STRING, 0, POPT_BUILDOS, - N_("override build operating system"), "OS" }, + + { "bp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BP, + N_("build through %%prep stage from spec file"), NULL}, + { "bc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BC, + N_("build through %%build stage from spec file"), NULL}, + { "bi", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BI, + N_("build through %%install stage from spec file"), NULL}, + { "bl", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BL, + N_("verify %%files section from spec file"), NULL}, + { "ba", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BA, + N_("build source and binary package from spec file"), NULL}, + { "bb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BB, + N_("build binary package from spec file"), NULL}, + { "bs", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BS, + N_("build source package from spec file"), NULL}, + + { "tp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TP, + N_("build through %%prep stage from tar ball"), NULL}, + { "tc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TC, + N_("build through %%build stage from tar ball"), NULL}, + { "ti", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TI, + N_("build through %%install stage from tar ball"), NULL}, + { "tl", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TL, + N_("verify %%files section from tar ball"), NULL}, + { "ta", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TA, + N_("build source and binary package from tar ball"), NULL}, + { "tb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TB, + N_("build binary package from tar ball"), NULL}, + { "ts", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TS, + N_("build source package from tar ball"), NULL}, + + { "rebuild", '\0', 0, 0, POPT_REBUILD, + N_("build binary package from source package"), NULL}, + { "recompile", '\0', 0, 0, POPT_REBUILD, + N_("build through %%install stage from source package"), NULL}, + { "buildroot", '\0', POPT_ARG_STRING, 0, POPT_BUILDROOT, N_("override build root"), "DIRECTORY" }, { "clean", '\0', 0, 0, POPT_RMBUILD, diff --git a/build.h b/build.h index 325d159..7cc515f 100644 --- a/build.h +++ b/build.h @@ -15,6 +15,7 @@ struct rpmBuildArguments { int noLang; int noBuild; int shortCircuit; + char buildMode; char buildChar; /*@dependent@*/ const char *rootdir; }; diff --git a/doc/rpm.8 b/doc/rpm.8 index 3518516..ddf170f 100644 --- a/doc/rpm.8 +++ b/doc/rpm.8 @@ -397,8 +397,7 @@ and build stages). This generally involves the equivalent of a .IP "\fB\-bb\fP" Build a binary package (after doing the prep, build, and install stages). .IP "\fB\-bs\fP" -Build just the source package (after doing the prep, build, and install -stages). +Build just the source package. .IP "\fB\-ba\fP" Build binary and source packages (after doing the prep, build, and install stages). diff --git a/lib/query.c b/lib/query.c index 6dd2f89..7c61adb 100644 --- a/lib/query.c +++ b/lib/query.c @@ -731,23 +731,31 @@ static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con, QVA_t *qva = (QVA_t *) data; switch (opt->val) { - case 'a': qva->qva_source |= RPMQV_ALL; qva->qva_sourceCount++; break; - case 'f': qva->qva_source |= RPMQV_PATH; qva->qva_sourceCount++; break; - case 'g': qva->qva_source |= RPMQV_GROUP; qva->qva_sourceCount++; break; - case 'p': qva->qva_source |= RPMQV_RPM; qva->qva_sourceCount++; break; - case POPT_WHATPROVIDES: qva->qva_source |= RPMQV_WHATPROVIDES; + case 'q': + case 'Q': + case 'V': + if (qva->qva_mode == ' ') { + qva->qva_mode = opt->val; + qva->qva_char = ' '; + } + break; + case 'a': qva->qva_source |= RPMQV_ALL; qva->qva_sourceCount++; break; + case 'f': qva->qva_source |= RPMQV_PATH; qva->qva_sourceCount++; break; + case 'g': qva->qva_source |= RPMQV_GROUP; qva->qva_sourceCount++; break; + case 'p': qva->qva_source |= RPMQV_RPM; qva->qva_sourceCount++; break; + case POPT_WHATPROVIDES: qva->qva_source |= RPMQV_WHATPROVIDES; qva->qva_sourceCount++; break; - case POPT_WHATREQUIRES: qva->qva_source |= RPMQV_WHATREQUIRES; + case POPT_WHATREQUIRES: qva->qva_source |= RPMQV_WHATREQUIRES; qva->qva_sourceCount++; break; - case POPT_TRIGGEREDBY: qva->qva_source |= RPMQV_TRIGGEREDBY; + case POPT_TRIGGEREDBY: qva->qva_source |= RPMQV_TRIGGEREDBY; qva->qva_sourceCount++; break; /* XXX SPECFILE is not verify sources */ - case POPT_SPECFILE: + case POPT_SPECFILE: qva->qva_source |= RPMQV_SPECFILE; qva->qva_sourceCount++; break; - case POPT_QUERYBYNUMBER: + case POPT_QUERYBYNUMBER: qva->qva_source |= RPMQV_DBOFFSET; qva->qva_sourceCount++; break; @@ -763,12 +771,20 @@ struct poptOption rpmQVSourcePoptTable[] = { N_("query packages in group"), "GROUP" }, { "package", 'p', 0, 0, 'p', N_("query a package file"), NULL }, + { "query", 'q', 0, NULL, 'q', + N_("rpm query mode"), NULL }, { "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYNUMBER, NULL, NULL }, + { "querytags", '\0', 0, 0, 'Q', + N_("display known query tags"), NULL }, { "specfile", '\0', 0, 0, POPT_SPECFILE, N_("query a spec file"), NULL }, { "triggeredby", '\0', 0, 0, POPT_TRIGGEREDBY, N_("query the pacakges triggered by the package"), "PACKAGE" }, + { "verify", 'V', 0, NULL, 'V', + N_("rpm verify mode"), NULL }, + { NULL, 'y', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V', + N_("rpm verify mode (legacy)"), NULL }, { "whatrequires", '\0', 0, 0, POPT_WHATREQUIRES, N_("query the packages which require a capability"), "CAPABILITY" }, { "whatprovides", '\0', 0, 0, POPT_WHATPROVIDES, @@ -785,14 +801,15 @@ static void queryArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptC QVA_t *qva = (QVA_t *) data; switch (opt->val) { - case 'c': qva->qva_flags |= QUERY_FOR_CONFIG | QUERY_FOR_LIST; break; - case 'd': qva->qva_flags |= QUERY_FOR_DOCS | QUERY_FOR_LIST; break; - case 'l': qva->qva_flags |= QUERY_FOR_LIST; break; - case 's': qva->qva_flags |= QUERY_FOR_STATE | QUERY_FOR_LIST; break; - case POPT_DUMP: qva->qva_flags |= QUERY_FOR_DUMPFILES | QUERY_FOR_LIST; break; - case 'v': rpmIncreaseVerbosity(); break; - - case POPT_QUERYFORMAT: + case 'c': qva->qva_flags |= QUERY_FOR_CONFIG | QUERY_FOR_LIST; break; + case 'd': qva->qva_flags |= QUERY_FOR_DOCS | QUERY_FOR_LIST; break; + case 'l': qva->qva_flags |= QUERY_FOR_LIST; break; + case 's': qva->qva_flags |= QUERY_FOR_STATE | QUERY_FOR_LIST; + break; + case POPT_DUMP: qva->qva_flags |= QUERY_FOR_DUMPFILES | QUERY_FOR_LIST; break; + case 'v': rpmIncreaseVerbosity(); break; + + case POPT_QUERYFORMAT: { char *qf = (char *)qva->qva_queryFormat; if (qf) { int len = strlen(qf) + strlen(arg) + 1; diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 63dc51b..a738a1e 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -246,7 +246,9 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags) } if (_dbapi <= 0) { /* failed to open with any dbapi */ - rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"), + static int _printed[32]; + if (!_printed[dbix & 0x1f]++) + rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"), tagName(rpmtag)); rc = 1; } else /* suggest possible conversion */ diff --git a/lib/rpmlib.h b/lib/rpmlib.h index ae09cfb..e250c91 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -863,6 +863,8 @@ struct rpmQVArguments { int qva_verbose; const char *qva_queryFormat; const char *qva_prefix; + char qva_mode; + char qva_char; }; typedef struct rpmQVArguments QVA_t; diff --git a/po/rpm.pot b/po/rpm.pot index 3481d92..8a29a11 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-05-24 13:46-0400\n" +"POT-Creation-Date: 2000-05-26 14:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,59 +65,107 @@ msgstr "" msgid "Building for target %s\n" msgstr "" -#: build.c:349 +#: build.c:386 msgid "buildroot already specified" msgstr "" -#: build.c:356 -msgid "--buildarch has been obsoleted. Use the --target option instead.\n" +#: build.c:412 +msgid "build through %%prep stage from spec file" msgstr "" -#: build.c:360 -msgid "--buildos has been obsoleted. Use the --target option instead.\n" +#: build.c:414 +msgid "build through %%build stage from spec file" msgstr "" -#: build.c:382 -msgid "override build architecture" +#: build.c:416 +msgid "build through %%install stage from spec file" msgstr "" -#: build.c:384 -msgid "override build operating system" +#: build.c:418 +msgid "verify %%files section from spec file" msgstr "" -#: build.c:386 +#: build.c:420 +msgid "build source and binary package from spec file" +msgstr "" + +#: build.c:422 +msgid "build binary package from spec file" +msgstr "" + +#: build.c:424 +msgid "build source package from spec file" +msgstr "" + +#: build.c:427 +msgid "build through %%prep stage from tar ball" +msgstr "" + +#: build.c:429 +msgid "build through %%build stage from tar ball" +msgstr "" + +#: build.c:431 +msgid "build through %%install stage from tar ball" +msgstr "" + +#: build.c:433 +msgid "verify %%files section from tar ball" +msgstr "" + +#: build.c:435 +msgid "build source and binary package from tar ball" +msgstr "" + +#: build.c:437 +msgid "build binary package from tar ball" +msgstr "" + +#: build.c:439 +msgid "build source package from tar ball" +msgstr "" + +#: build.c:442 +msgid "build binary package from source package" +msgstr "" + +#: build.c:444 +msgid "build through %%install stage from source package" +msgstr "" + +#: build.c:447 msgid "override build root" msgstr "" -#: build.c:388 rpm.c:514 +#: build.c:449 rpm.c:485 msgid "remove build tree when done" msgstr "" -#: build.c:390 +#: build.c:451 msgid "do not execute any stages of the build" msgstr "" -#: build.c:392 +#: build.c:453 msgid "do not accept I18N msgstr's from specfile" msgstr "" -#: build.c:394 rpm.c:516 +#: build.c:455 rpm.c:487 msgid "remove sources when done" msgstr "" -#: build.c:396 +#: build.c:457 msgid "remove specfile when done" msgstr "" -#: build.c:398 rpm.c:512 +#: build.c:459 rpm.c:483 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: build.c:400 +#: build.c:461 msgid "override target platform" msgstr "" -#: build.c:402 +#: build.c:463 msgid "lookup I18N strings in specfile catalog" msgstr "" @@ -163,1067 +211,1025 @@ msgstr "" msgid "no copyright!\n" msgstr "" -#: rpm.c:211 +#: rpm.c:182 #, c-format msgid "rpm: %s\n" msgstr "" -#: rpm.c:222 +#: rpm.c:193 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpm.c:226 +#: rpm.c:197 msgid "Copyright (C) 1998 - Red Hat Software" msgstr "" -#: rpm.c:227 +#: rpm.c:198 msgid "This may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpm.c:235 +#: rpm.c:206 msgid "Usage: rpm {--help}" msgstr "" -#: rpm.c:236 +#: rpm.c:207 msgid " rpm {--version}" msgstr "" -#: rpm.c:237 +#: rpm.c:208 msgid " rpm {--initdb} [--dbpath ]" msgstr "" -#: rpm.c:238 +#: rpm.c:209 msgid "" " rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:239 +#: rpm.c:210 msgid " [--replacepkgs] [--replacefiles] [--root ]" msgstr "" -#: rpm.c:240 +#: rpm.c:211 msgid " [--excludedocs] [--includedocs] [--noscripts]" msgstr "" -#: rpm.c:241 +#: rpm.c:212 msgid "" " [--rcfile ] [--ignorearch] [--dbpath ]" msgstr "" -#: rpm.c:242 +#: rpm.c:213 msgid "" " [--prefix ] [--ignoreos] [--nodeps] [--allfiles]" msgstr "" -#: rpm.c:243 +#: rpm.c:214 msgid "" " [--ftpproxy ] [--ftpport ] [--justdb]" msgstr "" -#: rpm.c:244 rpm.c:253 rpm.c:262 +#: rpm.c:215 rpm.c:224 rpm.c:233 msgid " [--httpproxy ] [--httpport ] " msgstr "" -#: rpm.c:245 rpm.c:255 +#: rpm.c:216 rpm.c:226 msgid " [--noorder] [--relocate oldpath=newpath]" msgstr "" -#: rpm.c:246 +#: rpm.c:217 msgid "" " [--badreloc] [--notriggers] [--excludepath ]" msgstr "" -#: rpm.c:247 +#: rpm.c:218 msgid " [--ignoresize] file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:248 +#: rpm.c:219 msgid "" " rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:249 +#: rpm.c:220 msgid " [--oldpackage] [--root ] [--noscripts]" msgstr "" -#: rpm.c:250 +#: rpm.c:221 msgid "" " [--excludedocs] [--includedocs] [--rcfile ]" msgstr "" -#: rpm.c:251 +#: rpm.c:222 msgid "" " [--ignorearch] [--dbpath ] [--prefix ] " msgstr "" -#: rpm.c:252 +#: rpm.c:223 msgid " [--ftpproxy ] [--ftpport ]" msgstr "" -#: rpm.c:254 +#: rpm.c:225 msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]" msgstr "" -#: rpm.c:256 +#: rpm.c:227 msgid "" " [--badreloc] [--excludepath ] [--ignoresize]" msgstr "" -#: rpm.c:257 +#: rpm.c:228 msgid " file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:258 +#: rpm.c:229 msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]" msgstr "" -#: rpm.c:259 +#: rpm.c:230 msgid " [--scripts] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:260 +#: rpm.c:231 msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" -#: rpm.c:261 +#: rpm.c:232 msgid "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" msgstr "" -#: rpm.c:263 +#: rpm.c:234 msgid "" " [--ftpport ] [--provides] [--triggers] [--dump]" msgstr "" -#: rpm.c:264 +#: rpm.c:235 msgid " [--changelog] [--dbpath ] [targets]" msgstr "" -#: rpm.c:265 +#: rpm.c:236 msgid " rpm {--verify -V -y} [-afpg] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:266 +#: rpm.c:237 msgid "" " [--dbpath ] [--nodeps] [--nofiles] [--noscripts]" msgstr "" -#: rpm.c:267 +#: rpm.c:238 msgid " [--nomd5] [targets]" msgstr "" -#: rpm.c:268 +#: rpm.c:239 msgid " rpm {--setperms} [-afpg] [target]" msgstr "" -#: rpm.c:269 +#: rpm.c:240 msgid " rpm {--setugids} [-afpg] [target]" msgstr "" -#: rpm.c:270 +#: rpm.c:241 msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:271 +#: rpm.c:242 msgid " rpm {--erase -e} [--root ] [--noscripts] [--rcfile ]" msgstr "" -#: rpm.c:272 +#: rpm.c:243 msgid " [--dbpath ] [--nodeps] [--allmatches]" msgstr "" -#: rpm.c:273 +#: rpm.c:244 msgid "" " [--justdb] [--notriggers] rpackage1 ... packageN" msgstr "" -#: rpm.c:274 +#: rpm.c:245 msgid "" -" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile ]" +" rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " +"]" msgstr "" -#: rpm.c:275 +#: rpm.c:246 msgid " [--sign] [--nobuild] [--timecheck ] ]" msgstr "" -#: rpm.c:276 +#: rpm.c:247 msgid " [--target=platform1[,platform2...]]" msgstr "" -#: rpm.c:277 +#: rpm.c:248 msgid " [--rmsource] [--rmspec] specfile" msgstr "" -#: rpm.c:278 +#: rpm.c:249 msgid " rpm {--rmsource} [--rcfile ] [-v] specfile" msgstr "" -#: rpm.c:279 +#: rpm.c:250 msgid "" " rpm {--rebuild} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:280 +#: rpm.c:251 msgid "" " rpm {--recompile} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:281 +#: rpm.c:252 msgid " rpm {--resign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:282 +#: rpm.c:253 msgid " rpm {--addsign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:283 +#: rpm.c:254 msgid "" " rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile ]" msgstr "" -#: rpm.c:284 +#: rpm.c:255 msgid " package1 ... packageN" msgstr "" -#: rpm.c:285 +#: rpm.c:256 msgid " rpm {--rebuilddb} [--rcfile ] [--dbpath ]" msgstr "" -#: rpm.c:286 +#: rpm.c:257 msgid " rpm {--querytags}" msgstr "" -#: rpm.c:320 +#: rpm.c:291 msgid "Usage:" msgstr "" -#: rpm.c:322 +#: rpm.c:293 msgid "print this message" msgstr "" -#: rpm.c:324 +#: rpm.c:295 msgid "print the version of rpm being used" msgstr "" -#: rpm.c:327 +#: rpm.c:298 msgid " All modes support the following arguments:" msgstr "" -#: rpm.c:328 +#: rpm.c:299 msgid " --define ' '" msgstr "" -#: rpm.c:329 +#: rpm.c:300 msgid "define macro with value " msgstr "" -#: rpm.c:330 +#: rpm.c:301 msgid " --eval '+' " msgstr "" -#: rpm.c:331 +#: rpm.c:302 msgid "print the expansion of macro to stdout" msgstr "" -#: rpm.c:332 +#: rpm.c:303 msgid " --pipe " msgstr "" -#: rpm.c:333 +#: rpm.c:304 msgid "send stdout to " msgstr "" -#: rpm.c:334 +#: rpm.c:305 msgid " --rcfile " msgstr "" -#: rpm.c:335 +#: rpm.c:306 msgid "use instead of /etc/rpmrc and $HOME/.rpmrc" msgstr "" -#: rpm.c:337 +#: rpm.c:308 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpm.c:339 +#: rpm.c:310 msgid "be a little more verbose" msgstr "" -#: rpm.c:341 +#: rpm.c:312 msgid "be incredibly verbose (for debugging)" msgstr "" -#: rpm.c:344 +#: rpm.c:315 msgid " Install, upgrade and query (with -p) allow URL's to be used in place" msgstr "" -#: rpm.c:345 +#: rpm.c:316 msgid " of file names as well as the following options:" msgstr "" -#: rpm.c:346 +#: rpm.c:317 msgid " --ftpproxy " msgstr "" -#: rpm.c:347 +#: rpm.c:318 msgid "hostname or IP of ftp proxy" msgstr "" -#: rpm.c:348 +#: rpm.c:319 msgid " --ftpport " msgstr "" -#: rpm.c:349 +#: rpm.c:320 msgid "port number of ftp server (or proxy)" msgstr "" -#: rpm.c:350 +#: rpm.c:321 msgid " --httpproxy " msgstr "" -#: rpm.c:351 +#: rpm.c:322 msgid "hostname or IP of http proxy" msgstr "" -#: rpm.c:352 +#: rpm.c:323 msgid " --httpport " msgstr "" -#: rpm.c:353 +#: rpm.c:324 msgid "port number of http server (or proxy)" msgstr "" -#: rpm.c:357 +#: rpm.c:328 msgid "query mode" msgstr "" -#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555 +#: rpm.c:329 rpm.c:375 rpm.c:400 rpm.c:452 rpm.c:526 msgid " --dbpath " msgstr "" -#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556 +#: rpm.c:330 rpm.c:376 rpm.c:401 rpm.c:453 rpm.c:527 msgid "use as the directory for the database" msgstr "" -#: rpm.c:360 +#: rpm.c:331 msgid " --queryformat " msgstr "" -#: rpm.c:361 +#: rpm.c:332 msgid "use as the header format (implies --info)" msgstr "" -#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493 +#: rpm.c:333 rpm.c:377 rpm.c:435 rpm.c:464 msgid " --root " msgstr "" -#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558 +#: rpm.c:334 rpm.c:378 rpm.c:436 rpm.c:465 rpm.c:529 msgid "use as the top level directory" msgstr "" -#: rpm.c:364 +#: rpm.c:335 msgid " Package specification options:" msgstr "" -#: rpm.c:366 +#: rpm.c:337 msgid "query all packages" msgstr "" -#: rpm.c:367 +#: rpm.c:338 msgid " -f + " msgstr "" -#: rpm.c:368 +#: rpm.c:339 msgid "query package owning " msgstr "" -#: rpm.c:369 +#: rpm.c:340 msgid " -p + " msgstr "" -#: rpm.c:370 +#: rpm.c:341 msgid "query (uninstalled) package " msgstr "" -#: rpm.c:371 +#: rpm.c:342 msgid " --triggeredby " msgstr "" -#: rpm.c:372 +#: rpm.c:343 msgid "query packages triggered by " msgstr "" -#: rpm.c:373 +#: rpm.c:344 msgid " --whatprovides " msgstr "" -#: rpm.c:374 +#: rpm.c:345 msgid "query packages which provide capability" msgstr "" -#: rpm.c:375 +#: rpm.c:346 msgid " --whatrequires " msgstr "" -#: rpm.c:376 +#: rpm.c:347 msgid "query packages which require capability" msgstr "" -#: rpm.c:377 +#: rpm.c:348 msgid " Information selection options:" msgstr "" -#: rpm.c:379 +#: rpm.c:350 msgid "display package information" msgstr "" -#: rpm.c:381 +#: rpm.c:352 msgid "display the package's change log" msgstr "" -#: rpm.c:383 +#: rpm.c:354 msgid "display package file list" msgstr "" -#: rpm.c:385 +#: rpm.c:356 msgid "show file states (implies -l)" msgstr "" -#: rpm.c:387 +#: rpm.c:358 msgid "list only documentation files (implies -l)" msgstr "" -#: rpm.c:389 +#: rpm.c:360 msgid "list only configuration files (implies -l)" msgstr "" -#: rpm.c:391 +#: rpm.c:362 msgid "" "show all verifiable information for each file (must be used with -l, -c, or " "-d)" msgstr "" -#: rpm.c:393 +#: rpm.c:364 msgid "list capabilities package provides" msgstr "" -#: rpm.c:395 +#: rpm.c:366 msgid "list package dependencies" msgstr "" -#: rpm.c:397 +#: rpm.c:368 msgid "print the various [un]install scripts" msgstr "" -#: rpm.c:399 +#: rpm.c:370 msgid "show the trigger scripts contained in the package" msgstr "" -#: rpm.c:403 +#: rpm.c:374 msgid "" "verify a package installation using the same same package specification " "options as -q" msgstr "" -#: rpm.c:409 rpm.c:451 rpm.c:486 +#: rpm.c:380 rpm.c:422 rpm.c:457 msgid "do not verify package dependencies" msgstr "" -#: rpm.c:411 +#: rpm.c:382 msgid "do not verify file md5 checksums" msgstr "" -#: rpm.c:413 +#: rpm.c:384 msgid "do not verify file attributes" msgstr "" -#: rpm.c:415 +#: rpm.c:386 msgid "list the tags that can be used in a query format" msgstr "" -#: rpm.c:418 +#: rpm.c:389 msgid " --install " msgstr "" -#: rpm.c:419 +#: rpm.c:390 msgid " -i " msgstr "" -#: rpm.c:420 +#: rpm.c:391 msgid "install package" msgstr "" -#: rpm.c:421 +#: rpm.c:392 msgid " --excludepath " msgstr "" -#: rpm.c:422 +#: rpm.c:393 msgid "skip files in path " msgstr "" -#: rpm.c:423 +#: rpm.c:394 msgid " --relocate =" msgstr "" -#: rpm.c:424 +#: rpm.c:395 msgid "relocate files from to " msgstr "" -#: rpm.c:426 +#: rpm.c:397 msgid "relocate files in non-relocateable package" msgstr "" -#: rpm.c:427 +#: rpm.c:398 msgid " --prefix " msgstr "" -#: rpm.c:428 +#: rpm.c:399 msgid "relocate the package to , if relocatable" msgstr "" -#: rpm.c:432 +#: rpm.c:403 msgid "do not install documentation" msgstr "" -#: rpm.c:434 +#: rpm.c:405 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: rpm.c:436 +#: rpm.c:407 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: rpm.c:438 +#: rpm.c:409 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: rpm.c:441 +#: rpm.c:412 msgid "don't verify package architecture" msgstr "" -#: rpm.c:443 +#: rpm.c:414 msgid "don't check disk space before installing" msgstr "" -#: rpm.c:445 +#: rpm.c:416 msgid "don't verify package operating system" msgstr "" -#: rpm.c:447 +#: rpm.c:418 msgid "install documentation" msgstr "" -#: rpm.c:449 rpm.c:484 +#: rpm.c:420 rpm.c:455 msgid "update the database, but do not modify the filesystem" msgstr "" -#: rpm.c:453 rpm.c:488 +#: rpm.c:424 rpm.c:459 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: rpm.c:455 +#: rpm.c:426 msgid "don't execute any installation scripts" msgstr "" -#: rpm.c:457 rpm.c:492 +#: rpm.c:428 rpm.c:463 msgid "don't execute any scripts triggered by this package" msgstr "" -#: rpm.c:459 +#: rpm.c:430 msgid "print percentages as package installs" msgstr "" -#: rpm.c:461 +#: rpm.c:432 msgid "install even if the package replaces installed files" msgstr "" -#: rpm.c:463 +#: rpm.c:434 msgid "reinstall if the package is already present" msgstr "" -#: rpm.c:467 +#: rpm.c:438 msgid "don't install, but tell if it would work or not" msgstr "" -#: rpm.c:470 +#: rpm.c:441 msgid " --upgrade " msgstr "" -#: rpm.c:471 +#: rpm.c:442 msgid " -U " msgstr "" -#: rpm.c:472 +#: rpm.c:443 msgid "upgrade package (same options as --install, plus)" msgstr "" -#: rpm.c:474 +#: rpm.c:445 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: rpm.c:476 +#: rpm.c:447 msgid " --erase " msgstr "" -#: rpm.c:478 +#: rpm.c:449 msgid "erase (uninstall) package" msgstr "" -#: rpm.c:480 +#: rpm.c:451 msgid "" "remove all packages which match (normally an error is generated if " " specified multiple packages)" msgstr "" -#: rpm.c:490 +#: rpm.c:461 msgid "do not execute any package specific scripts" msgstr "" -#: rpm.c:496 +#: rpm.c:467 msgid " -b " msgstr "" -#: rpm.c:497 +#: rpm.c:468 msgid " -t " msgstr "" -#: rpm.c:498 +#: rpm.c:469 msgid "build package, where is one of:" msgstr "" -#: rpm.c:500 +#: rpm.c:471 msgid "prep (unpack sources and apply patches)" msgstr "" -#: rpm.c:502 +#: rpm.c:473 #, c-format msgid "list check (do some cursory checks on %files)" msgstr "" -#: rpm.c:504 +#: rpm.c:475 msgid "compile (prep and compile)" msgstr "" -#: rpm.c:506 +#: rpm.c:477 msgid "install (prep, compile, install)" msgstr "" -#: rpm.c:508 +#: rpm.c:479 msgid "binary package (prep, compile, install, package)" msgstr "" -#: rpm.c:510 +#: rpm.c:481 msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: rpm.c:518 +#: rpm.c:489 msgid "remove spec file when done" msgstr "" -#: rpm.c:520 +#: rpm.c:491 msgid "generate PGP/GPG signature" msgstr "" -#: rpm.c:521 +#: rpm.c:492 msgid " --buildroot " msgstr "" -#: rpm.c:522 +#: rpm.c:493 msgid "use as the build root" msgstr "" -#: rpm.c:523 +#: rpm.c:494 msgid " --target=+" msgstr "" -#: rpm.c:524 +#: rpm.c:495 msgid "build the packages for the build targets platform1...platformN." msgstr "" -#: rpm.c:526 +#: rpm.c:497 msgid "do not execute any stages" msgstr "" -#: rpm.c:527 +#: rpm.c:498 msgid " --timecheck " msgstr "" -#: rpm.c:528 +#: rpm.c:499 msgid "set the time check to seconds (0 disables)" msgstr "" -#: rpm.c:530 +#: rpm.c:501 msgid " --rebuild " msgstr "" -#: rpm.c:531 +#: rpm.c:502 msgid "" "install source package, build binary package and remove spec file, sources, " "patches, and icons." msgstr "" -#: rpm.c:532 +#: rpm.c:503 msgid " --recompile " msgstr "" -#: rpm.c:533 +#: rpm.c:504 msgid "like --rebuild, but don't build any package" msgstr "" -#: rpm.c:536 +#: rpm.c:507 msgid " --resign + " msgstr "" -#: rpm.c:537 +#: rpm.c:508 msgid "sign a package (discard current signature)" msgstr "" -#: rpm.c:538 +#: rpm.c:509 msgid " --addsign + " msgstr "" -#: rpm.c:539 +#: rpm.c:510 msgid "add a signature to a package" msgstr "" -#: rpm.c:540 +#: rpm.c:511 msgid " --checksig +" msgstr "" -#: rpm.c:541 +#: rpm.c:512 msgid " -K + " msgstr "" -#: rpm.c:542 +#: rpm.c:513 msgid "verify package signature" msgstr "" -#: rpm.c:544 +#: rpm.c:515 msgid "skip any PGP signatures" msgstr "" -#: rpm.c:546 +#: rpm.c:517 msgid "skip any GPG signatures" msgstr "" -#: rpm.c:548 +#: rpm.c:519 msgid "skip any MD5 signatures" msgstr "" -#: rpm.c:552 +#: rpm.c:523 msgid "make sure a valid database exists" msgstr "" -#: rpm.c:554 +#: rpm.c:525 msgid "rebuild database from existing database" msgstr "" -#: rpm.c:562 +#: rpm.c:533 msgid "" "set the file permissions to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:565 +#: rpm.c:536 msgid "" "set the file owner and group to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801 -#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967 -#: rpm.c:974 +#: rpm.c:673 rpm.c:679 rpm.c:686 rpm.c:692 rpm.c:701 rpm.c:723 rpm.c:729 +#: rpm.c:763 rpm.c:771 rpm.c:792 rpm.c:849 rpm.c:857 msgid "only one major mode may be specified" msgstr "" -#: rpm.c:740 +#: rpm.c:694 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: rpm.c:742 +#: rpm.c:696 msgid "Use -e or --erase instead.\n" msgstr "" -#: rpm.c:758 -msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument" -msgstr "" - -#: rpm.c:762 -msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument" -msgstr "" - -#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981 +#: rpm.c:736 rpm.c:742 rpm.c:749 rpm.c:756 rpm.c:865 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpm.c:872 -msgid "arguments to --dbpath must begin with a /" -msgstr "" - -#: rpm.c:918 +#: rpm.c:798 msgid "relocations must begin with a /" msgstr "" -#: rpm.c:920 +#: rpm.c:800 msgid "relocations must contain a =" msgstr "" -#: rpm.c:923 +#: rpm.c:803 msgid "relocations must have a / following the =" msgstr "" -#: rpm.c:932 +#: rpm.c:812 msgid "exclude paths must begin with a /" msgstr "" -#: rpm.c:941 +#: rpm.c:821 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpm.c:993 -msgid "--dbpath given for operation that does not use a database" -msgstr "" - -#: rpm.c:997 -msgid "--timecheck may only be used during package builds" -msgstr "" - -#: rpm.c:1001 +#: rpm.c:871 msgid "unexpected query flags" msgstr "" -#: rpm.c:1004 +#: rpm.c:874 msgid "unexpected query format" msgstr "" -#: rpm.c:1007 +#: rpm.c:877 msgid "unexpected query source" msgstr "" -#: rpm.c:1013 +#: rpm.c:880 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpm.c:1016 +#: rpm.c:883 msgid "files may only be relocated during package installation" msgstr "" -#: rpm.c:1019 +#: rpm.c:886 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpm.c:1022 +#: rpm.c:889 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpm.c:1025 +#: rpm.c:892 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpm.c:1028 +#: rpm.c:895 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpm.c:1031 +#: rpm.c:898 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpm.c:1035 +#: rpm.c:902 msgid "--percent may only be specified during package installation" msgstr "" -#: rpm.c:1039 +#: rpm.c:906 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpm.c:1043 +#: rpm.c:910 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpm.c:1047 +#: rpm.c:914 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpm.c:1051 +#: rpm.c:918 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpm.c:1055 +#: rpm.c:922 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpm.c:1059 +#: rpm.c:926 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpm.c:1063 +#: rpm.c:930 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpm.c:1067 +#: rpm.c:934 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpm.c:1071 +#: rpm.c:938 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpm.c:1075 +#: rpm.c:942 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpm.c:1079 +#: rpm.c:946 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpm.c:1084 +#: rpm.c:951 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:1088 +#: rpm.c:955 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:1092 +#: rpm.c:959 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpm.c:1097 +#: rpm.c:964 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpm.c:1101 +#: rpm.c:968 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpm.c:1113 +#: rpm.c:980 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpm.c:1119 +#: rpm.c:986 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: rpm.c:1125 -msgid "" -"ftp options can only be used during package queries, installs, and upgrades" -msgstr "" - -#: rpm.c:1131 -msgid "" -"http options can only be used during package queries, installs, and upgrades" -msgstr "" - -#: rpm.c:1136 +#: rpm.c:989 msgid "--nopgp may only be used during signature checking" msgstr "" -#: rpm.c:1139 +#: rpm.c:992 msgid "--nogpg may only be used during signature checking" msgstr "" -#: rpm.c:1142 +#: rpm.c:995 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: rpm.c:1172 +#: rpm.c:1006 msgid "no files to sign\n" msgstr "" -#: rpm.c:1177 +#: rpm.c:1011 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpm.c:1192 +#: rpm.c:1026 msgid "pgp not found: " msgstr "" -#: rpm.c:1196 +#: rpm.c:1030 msgid "Enter pass phrase: " msgstr "" -#: rpm.c:1198 +#: rpm.c:1032 msgid "Pass phrase check failed\n" msgstr "" -#: rpm.c:1201 +#: rpm.c:1035 msgid "Pass phrase is good.\n" msgstr "" -#: rpm.c:1206 +#: rpm.c:1040 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpm.c:1212 +#: rpm.c:1046 msgid "--sign may only be used during package building" msgstr "" -#: rpm.c:1227 +#: rpm.c:1061 msgid "exec failed\n" msgstr "" -#: rpm.c:1246 +#: rpm.c:1080 msgid "unexpected arguments to --querytags " msgstr "" -#: rpm.c:1257 +#: rpm.c:1091 msgid "no packages given for signature check" msgstr "" -#: rpm.c:1268 +#: rpm.c:1102 msgid "no packages given for signing" msgstr "" -#: rpm.c:1280 -msgid "no packages files given for rebuild" -msgstr "" - -#: rpm.c:1343 -msgid "no spec files given for build" -msgstr "" - -#: rpm.c:1345 -msgid "no tar files given for build" -msgstr "" - -#: rpm.c:1361 +#: rpm.c:1118 msgid "no packages given for uninstall" msgstr "" -#: rpm.c:1411 +#: rpm.c:1168 msgid "no packages given for install" msgstr "" -#: rpm.c:1434 +#: rpm.c:1191 msgid "extra arguments given for query of all packages" msgstr "" -#: rpm.c:1439 +#: rpm.c:1196 msgid "no arguments given for query" msgstr "" -#: rpm.c:1456 +#: rpm.c:1213 msgid "extra arguments given for verify of all packages" msgstr "" -#: rpm.c:1460 +#: rpm.c:1217 msgid "no arguments given for verify" msgstr "" @@ -2732,63 +2738,79 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/query.c:761 +#: lib/query.c:770 msgid "query package owning file" msgstr "" -#: lib/query.c:763 +#: lib/query.c:772 msgid "query packages in group" msgstr "" -#: lib/query.c:765 +#: lib/query.c:774 msgid "query a package file" msgstr "" -#: lib/query.c:769 +#: lib/query.c:776 +msgid "rpm query mode" +msgstr "" + +#: lib/query.c:780 +msgid "display known query tags" +msgstr "" + +#: lib/query.c:782 msgid "query a spec file" msgstr "" -#: lib/query.c:771 +#: lib/query.c:784 msgid "query the pacakges triggered by the package" msgstr "" -#: lib/query.c:773 +#: lib/query.c:786 +msgid "rpm verify mode" +msgstr "" + +#: lib/query.c:788 +msgid "rpm verify mode (legacy)" +msgstr "" + +#: lib/query.c:790 msgid "query the packages which require a capability" msgstr "" -#: lib/query.c:775 +#: lib/query.c:792 msgid "query the packages which provide a capability" msgstr "" -#: lib/query.c:814 +#: lib/query.c:833 msgid "list all configuration files" msgstr "" -#: lib/query.c:816 +#: lib/query.c:835 msgid "list all documentation files" msgstr "" -#: lib/query.c:818 +#: lib/query.c:837 msgid "dump basic file information" msgstr "" -#: lib/query.c:820 +#: lib/query.c:839 msgid "list files in package" msgstr "" -#: lib/query.c:824 +#: lib/query.c:843 msgid "use the following query format" msgstr "" -#: lib/query.c:826 +#: lib/query.c:845 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/query.c:828 +#: lib/query.c:847 msgid "display the states of the listed files" msgstr "" -#: lib/query.c:830 +#: lib/query.c:849 msgid "display a verbose file listing" msgstr "" @@ -2890,13 +2912,12 @@ msgid "" "\n" msgstr "" -#. failed to open with any dbapi -#: lib/rpmdb.c:249 +#: lib/rpmdb.c:251 #, c-format msgid "dbiOpen: cannot open %s index" msgstr "" -#: lib/rpmdb.c:257 +#: lib/rpmdb.c:259 msgid "" "\n" "--> The database is in db%d format, not the suggested db%d format.\n" @@ -2907,7 +2928,7 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:270 +#: lib/rpmdb.c:272 msgid "" "\n" "--> The configured %%_dbapi was db%d, but the database is db%d format.\n" @@ -2917,140 +2938,140 @@ msgid "" "\n" msgstr "" -#: lib/rpmdb.c:335 +#: lib/rpmdb.c:337 #, c-format msgid "error getting \"%s\" records from %s index" msgstr "" -#: lib/rpmdb.c:452 +#: lib/rpmdb.c:454 #, c-format msgid "error storing record %s into %s" msgstr "" -#: lib/rpmdb.c:461 +#: lib/rpmdb.c:463 #, c-format msgid "error removing record %s from %s" msgstr "" -#: lib/rpmdb.c:683 lib/rpmdb.c:2192 +#: lib/rpmdb.c:685 lib/rpmdb.c:2194 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:780 +#: lib/rpmdb.c:782 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database" msgstr "" #. error -#: lib/rpmdb.c:984 +#: lib/rpmdb.c:986 #, c-format msgid "cannot retrieve package \"%s\" from db" msgstr "" -#: lib/rpmdb.c:1050 lib/rpmdb.c:1566 lib/uninstall.c:90 +#: lib/rpmdb.c:1052 lib/rpmdb.c:1568 lib/uninstall.c:90 #, c-format msgid "%s: cannot read header at 0x%x" msgstr "" -#: lib/rpmdb.c:1617 +#: lib/rpmdb.c:1619 #, c-format msgid "removing 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1628 +#: lib/rpmdb.c:1630 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: lib/rpmdb.c:1637 +#: lib/rpmdb.c:1639 #, c-format msgid "removing %d entries from %s index:\n" msgstr "" -#: lib/rpmdb.c:1644 lib/rpmdb.c:1867 +#: lib/rpmdb.c:1646 lib/rpmdb.c:1869 #, c-format msgid "%6d %s\n" msgstr "" -#: lib/rpmdb.c:1780 +#: lib/rpmdb.c:1782 msgid "cannot allocate new instance in database" msgstr "" -#: lib/rpmdb.c:1835 +#: lib/rpmdb.c:1837 #, c-format msgid "adding 0 %s entries.\n" msgstr "" -#: lib/rpmdb.c:1851 +#: lib/rpmdb.c:1853 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: lib/rpmdb.c:1860 +#: lib/rpmdb.c:1862 #, c-format msgid "adding %d entries to %s index:\n" msgstr "" -#: lib/rpmdb.c:2217 +#: lib/rpmdb.c:2219 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: lib/rpmdb.c:2221 +#: lib/rpmdb.c:2223 #, c-format msgid "temporary database %s already exists" msgstr "" -#: lib/rpmdb.c:2227 +#: lib/rpmdb.c:2229 #, c-format msgid "creating directory %s\n" msgstr "" -#: lib/rpmdb.c:2229 +#: lib/rpmdb.c:2231 #, c-format msgid "error creating directory %s: %s" msgstr "" -#: lib/rpmdb.c:2236 +#: lib/rpmdb.c:2238 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2245 +#: lib/rpmdb.c:2247 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: lib/rpmdb.c:2268 +#: lib/rpmdb.c:2270 #, c-format msgid "record number %d in database is bad -- skipping." msgstr "" -#: lib/rpmdb.c:2300 +#: lib/rpmdb.c:2302 #, c-format msgid "cannot add record originally at %d" msgstr "" -#: lib/rpmdb.c:2318 +#: lib/rpmdb.c:2320 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2326 +#: lib/rpmdb.c:2328 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2328 +#: lib/rpmdb.c:2330 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2338 +#: lib/rpmdb.c:2340 #, c-format msgid "removing directory %s\n" msgstr "" -#: lib/rpmdb.c:2340 +#: lib/rpmdb.c:2342 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/popt/po/popt.pot b/popt/po/popt.pot index f3d7527..9196a95 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-26 09:27-0400\n" +"POT-Creation-Date: 2000-05-26 14:35-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/rpm.c b/rpm.c index 1a69924..5af17b5 100755 --- a/rpm.c +++ b/rpm.c @@ -7,14 +7,9 @@ #include "install.h" #include "signature.h" -#define GETOPT_REBUILD 1003 -#define GETOPT_RECOMPILE 1004 #define GETOPT_ADDSIGN 1005 #define GETOPT_RESIGN 1006 #define GETOPT_DBPATH 1010 -#ifdef DYING -#define GETOPT_TIMECHECK 1012 -#endif #define GETOPT_REBUILDDB 1013 #define GETOPT_INSTALL 1014 #define GETOPT_RELOCATE 1016 @@ -58,12 +53,6 @@ static int badReloc; static int excldocs; static int force; extern int _ftp_debug; -#ifdef DYING -static char * ftpPort; -static char * ftpProxy; -static char * httpPort; -static char * httpProxy; -#endif static int showHash; static int help; static int ignoreArch; @@ -84,7 +73,6 @@ static int noUsageMsg; static int oldPackage; static char * pipeOutput; static char * prefix; -static int queryTags; static int quiet; static char * rcfile; static int replaceFiles; @@ -107,7 +95,6 @@ extern int rpmFLAGS; extern MacroContext rpmCLIMacroContext; static struct rpmQVArguments rpmQVArgs; -static struct rpmBuildArguments rpmBArgs; /* the structure describing the options we take and the defaults */ static struct poptOption optionsTable[] = { @@ -117,11 +104,7 @@ static struct poptOption optionsTable[] = { { "allfiles", '\0', 0, &allFiles, 0, NULL, NULL}, { "allmatches", '\0', 0, &allMatches, 0, NULL, NULL}, { "badreloc", '\0', 0, &badReloc, 0, NULL, NULL}, - { "build", 'b', POPT_ARG_STRING, 0, 'b', NULL, NULL}, { "checksig", 'K', 0, 0, 'K', NULL, NULL}, -#ifdef DYING - { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH, NULL, NULL}, -#endif { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,NULL, NULL}, { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0, NULL, NULL}, { "erase", 'e', 0, 0, 'e', NULL, NULL}, @@ -130,16 +113,8 @@ static struct poptOption optionsTable[] = { { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH, NULL, NULL}, { "force", '\0', 0, &force, 0, NULL, NULL}, { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1, NULL, NULL}, -#ifdef DYING - { "ftpport", '\0', POPT_ARG_STRING, &ftpPort, 0, NULL, NULL}, - { "ftpproxy", '\0', POPT_ARG_STRING, &ftpProxy, 0, NULL, NULL}, -#endif { "hash", 'h', 0, &showHash, 0, NULL, NULL}, { "help", '\0', 0, &help, 0, NULL, NULL}, -#ifdef DYING - { "httpport", '\0', POPT_ARG_STRING, &httpPort, 0, NULL, NULL}, - { "httpproxy", '\0', POPT_ARG_STRING, &httpProxy, 0, NULL, NULL}, -#endif { NULL, 'i', 0, 0, 'i', NULL, NULL}, { "ignorearch", '\0', 0, &ignoreArch, 0, NULL, NULL}, { "ignoreos", '\0', 0, &ignoreOs, 0, NULL, NULL}, @@ -164,13 +139,13 @@ static struct poptOption optionsTable[] = { { "percent", '\0', 0, &showPercents, 0, NULL, NULL}, { "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0, NULL, NULL}, { "prefix", '\0', POPT_ARG_STRING, &prefix, 0, NULL, NULL}, +#ifdef DYING { "query", 'q', 0, NULL, 'q', NULL, NULL}, { "querytags", '\0', 0, &queryTags, 0, NULL, NULL}, +#endif { "quiet", '\0', 0, &quiet, 0, NULL, NULL}, { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0, NULL, NULL}, - { "rebuild", '\0', 0, 0, GETOPT_REBUILD, NULL, NULL}, { "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB, NULL, NULL}, - { "recompile", '\0', 0, 0, GETOPT_RECOMPILE, NULL, NULL}, { "relocate", '\0', POPT_ARG_STRING, 0, GETOPT_RELOCATE, NULL, NULL}, { "replacefiles", '\0', 0, &replaceFiles, 0, NULL, NULL}, { "replacepkgs", '\0', 0, &replacePackages, 0, NULL, NULL}, @@ -179,17 +154,15 @@ static struct poptOption optionsTable[] = { { "rpmiodebug", '\0', POPT_ARG_VAL, &_rpmio_debug, -1, NULL, NULL}, { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC, NULL, NULL}, { "sign", '\0', 0, &signIt, 0, NULL, NULL}, - { "tarbuild", 't', POPT_ARG_STRING, 0, 't', NULL, NULL}, { "test", '\0', 0, &test, 0, NULL, NULL}, -#ifdef DYING - { "timecheck", '\0', POPT_ARG_STRING, 0, GETOPT_TIMECHECK, NULL, NULL}, -#endif { "upgrade", 'U', 0, 0, 'U', NULL, NULL}, { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1, NULL, NULL}, { "uninstall", 'u', 0, 0, 'u', NULL, NULL}, { "verbose", 'v', 0, 0, 'v', NULL, NULL}, +#ifdef DYING { "verify", 'V', 0, 0, 'V', NULL, NULL}, { NULL, 'y', 0, 0, 'V', NULL, NULL}, +#endif { "version", '\0', 0, &showVersion, 0, NULL, NULL}, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0, (void *) &rpmQVArgs, NULL }, @@ -197,8 +170,6 @@ static struct poptOption optionsTable[] = { rpmQueryPoptTable, 0, (void *) &rpmQVArgs, NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmVerifyPoptTable, 0, (void *) &rpmQVArgs, NULL }, - { NULL, '\0', POPT_ARG_INCLUDE_TABLE, - rpmBuildPoptTable, 0, (void *) &rpmBArgs, NULL }, { 0, 0, 0, 0, 0, NULL, NULL } }; @@ -207,7 +178,7 @@ static struct poptOption optionsTable[] = { long _stksize = 64 * 1024L; #endif -static void argerror(char * desc) { +static void argerror(const char * desc) { fprintf(stderr, _("rpm: %s\n"), desc); exit(EXIT_FAILURE); } @@ -271,7 +242,7 @@ static void printUsage(void) { puts(_(" rpm {--erase -e} [--root ] [--noscripts] [--rcfile ]")); puts(_(" [--dbpath ] [--nodeps] [--allmatches]")); puts(_(" [--justdb] [--notriggers] rpackage1 ... packageN")); - puts(_(" rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile ]")); + puts(_(" rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile ]")); puts(_(" [--sign] [--nobuild] [--timecheck ] ]")); puts(_(" [--target=platform1[,platform2...]]")); puts(_(" [--rmsource] [--rmspec] specfile")); @@ -571,26 +542,18 @@ int main(int argc, const char ** argv) { enum modes bigMode = MODE_UNKNOWN; QVA_t *qva = &rpmQVArgs; - struct rpmBuildArguments *ba = &rpmBArgs; enum rpmQVSources QVSource = RPMQV_PACKAGE; int arg; int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0; -#ifdef DYING - int gotDbpath = 0; -#endif int verifyFlags; int checksigFlags = 0; int addSign = NEW_SIGNATURE; - const char * specFile; char * passPhrase = ""; - char * cookie = NULL; const char * optArg; pid_t pipeChild = 0; const char * pkg; char * errString = NULL; poptContext optCon; - const char * infoCommand[] = { "--info", NULL }; - const char * installCommand[] = { "--install", NULL }; int ec = 0; int status; int p[2]; @@ -612,12 +575,6 @@ int main(int argc, const char ** argv) excldocs = 0; force = 0; _ftp_debug = 0; -#ifdef DYING - ftpProxy = NULL; - ftpPort = NULL; - httpProxy = NULL; - httpPort = NULL; -#endif showHash = 0; help = 0; ignoreArch = 0; @@ -643,7 +600,6 @@ int main(int argc, const char ** argv) showPercents = 0; pipeOutput = NULL; prefix = NULL; - queryTags = 0; quiet = 0; _rpmio_debug = 0; replaceFiles = 0; @@ -705,10 +661,8 @@ int main(int argc, const char ** argv) if (qva->qva_queryFormat) xfree(qva->qva_queryFormat); memset(qva, 0, sizeof(*qva)); - if (ba->buildRootOverride) xfree(ba->buildRootOverride); - if (ba->targets) free(ba->targets); - memset(ba, 0, sizeof(*ba)); - ba->buildChar = ' '; + qva->qva_mode = ' '; + qva->qva_char = ' '; while ((arg = poptGetNextOpt(optCon)) > 0) { optArg = poptGetOptArg(optCon); @@ -748,52 +702,20 @@ int main(int argc, const char ** argv) bigMode = MODE_UNINSTALL; break; - case 'b': - case 't': - if (bigMode != MODE_UNKNOWN && bigMode != MODE_BUILD) - argerror(_("only one major mode may be specified")); - - if (arg == 'b') { - bigMode = MODE_BUILD; - errString = _("--build (-b) requires one of a,b,i,c,p,l as " - "its sole argument"); - } else { - bigMode = MODE_TARBUILD; - errString = _("--tarbuild (-t) requires one of a,b,i,c,p,l as " - "its sole argument"); - } - - if (strlen(optArg) > 1) - argerror(errString); - - ba->buildChar = optArg[0]; - switch (ba->buildChar) { - case 'a': - case 'b': - case 'i': - case 'c': - case 'p': - case 'l': - case 's': - break; - default: - argerror(errString); - break; - } - - break; - case 'v': rpmIncreaseVerbosity(); break; case 'i': - if (bigMode == MODE_QUERY) + if (bigMode == MODE_QUERY) { + const char * infoCommand[] = { "--info", NULL }; poptStuffArgs(optCon, infoCommand); - else if (bigMode == MODE_INSTALL) + } else if (bigMode == MODE_INSTALL) /*@-ifempty@*/ ; - else if (bigMode == MODE_UNKNOWN) + else if (bigMode == MODE_UNKNOWN) { + const char * installCommand[] = { "--install", NULL }; poptStuffArgs(optCon, installCommand); + } break; case GETOPT_INSTALL: @@ -836,18 +758,6 @@ int main(int argc, const char ** argv) QVSource = RPMQV_ALL; break; - case GETOPT_REBUILD: - if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILD) - argerror(_("only one major mode may be specified")); - bigMode = MODE_REBUILD; - break; - - case GETOPT_RECOMPILE: - if (bigMode != MODE_UNKNOWN && bigMode != MODE_RECOMPILE) - argerror(_("only one major mode may be specified")); - bigMode = MODE_RECOMPILE; - break; - case GETOPT_RESIGN: if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN) argerror(_("only one major mode may be specified")); @@ -864,22 +774,6 @@ int main(int argc, const char ** argv) signIt = 1; break; -#ifdef DYING - case GETOPT_DBPATH: - switch (urlIsURL(optArg)) { - case URL_IS_UNKNOWN: - if (optArg[0] != '/') - argerror(_("arguments to --dbpath must begin with a /")); - break; - default: - break; - } - addMacro(NULL, "_dbpath", NULL, optArg, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_dbpath", NULL, optArg, RMIL_CMDLINE); - gotDbpath = 1; - break; -#endif /* DYING */ - case GETOPT_DEFINEMACRO: rpmDefineMacro(NULL, optArg, RMIL_CMDLINE); rpmDefineMacro(&rpmCLIMacroContext, optArg, RMIL_CMDLINE); @@ -893,20 +787,6 @@ int main(int argc, const char ** argv) noUsageMsg = 1; } break; -#ifdef DYING - case GETOPT_TIMECHECK: - { char * tce = NULL; - unsigned long int timeCheck = 0L; - timeCheck = strtoul(optArg, &tce, 10); - if ((*tce) || (tce == optArg) || (timeCheck == ULONG_MAX)) { - argerror("Argument to --timecheck must be integer"); - } - addMacro(NULL, "_timecheck", NULL, optArg, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_timecheck", NULL, optArg, RMIL_CMDLINE); - timeCheck = 1; - } break; -#endif - case GETOPT_REBUILDDB: if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILDDB) argerror(_("only one major mode may be specified")); @@ -956,12 +836,14 @@ int main(int argc, const char ** argv) exit(EXIT_FAILURE); } - if ((ba->buildAmount & RPMBUILD_RMSOURCE) && bigMode == MODE_UNKNOWN) - bigMode = MODE_BUILD; + if (bigMode == MODE_UNKNOWN && qva->qva_mode != ' ') { + switch (qva->qva_mode) { + case 'q': bigMode = MODE_QUERY; break; + case 'V': bigMode = MODE_VERIFY; break; + case 'Q': bigMode = MODE_QUERYTAGS; break; + } + } - if ((ba->buildAmount & RPMBUILD_RMSPEC) && bigMode == MODE_UNKNOWN) - bigMode = MODE_BUILD; - if (initdb) { if (bigMode != MODE_UNKNOWN) argerror(_("only one major mode may be specified")); @@ -969,12 +851,14 @@ int main(int argc, const char ** argv) bigMode = MODE_INITDB; } +#ifdef DYING if (queryTags) { if (bigMode != MODE_UNKNOWN) argerror(_("only one major mode may be specified")); else bigMode = MODE_QUERYTAGS; } +#endif if (qva->qva_sourceCount) { if (QVSource != RPMQV_PACKAGE || qva->qva_sourceCount > 1) @@ -983,20 +867,6 @@ int main(int argc, const char ** argv) QVSource = qva->qva_source; } - if (ba->buildRootOverride && bigMode != MODE_BUILD && - bigMode != MODE_REBUILD && bigMode != MODE_TARBUILD) { - argerror("--buildroot may only be used during package builds"); - } - -#ifdef DYING - if (gotDbpath && (bigMode & ~MODES_FOR_DBPATH)) - argerror(_("--dbpath given for operation that does not use a " - "database")); - - if (timeCheck && (bigMode & ~MODES_BT)) - argerror(_("--timecheck may only be used during package builds")); -#endif - if (qva->qva_flags && (bigMode & ~MODES_QV)) argerror(_("unexpected query flags")); @@ -1006,10 +876,7 @@ int main(int argc, const char ** argv) if (QVSource != RPMQV_PACKAGE && (bigMode & ~MODES_QV)) argerror(_("unexpected query source")); - if (!(bigMode == MODE_INSTALL || - (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSOURCE))|| - (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSPEC))) - && force) + if (!(bigMode == MODE_INSTALL) && force) argerror(_("only installation, upgrading, rmsource and rmspec may be forced")); if (bigMode != MODE_INSTALL && badReloc) @@ -1118,20 +985,6 @@ int main(int argc, const char ** argv) if (oldPackage && !upgrade) argerror(_("--oldpackage may only be used during upgrades")); -#ifdef DYING - if ((ftpProxy || ftpPort) && !(bigMode == MODE_INSTALL || - ((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) || - ((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM)))) - argerror(_("ftp options can only be used during package queries, " - "installs, and upgrades")); - - if ((httpProxy || httpPort) && !(bigMode == MODE_INSTALL || - ((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) || - ((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM)))) - argerror(_("http options can only be used during package queries, " - "installs, and upgrades")); -#endif /* DYING */ - if (noPgp && bigMode != MODE_CHECKSIG) argerror(_("--nopgp may only be used during signature checking")); @@ -1142,25 +995,6 @@ int main(int argc, const char ** argv) argerror(_("--nomd5 may only be used during signature checking and " "package verification")); -#ifdef DYING - if (ftpProxy) { - addMacro(NULL, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE); - } - if (ftpPort) { - addMacro(NULL, "_ftpport", NULL, ftpPort, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_ftpport", NULL, ftpPort, RMIL_CMDLINE); - } - if (httpProxy) { - addMacro(NULL, "_httpproxy", NULL, httpProxy, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_httpproxy", NULL, httpProxy, RMIL_CMDLINE); - } - if (httpPort) { - addMacro(NULL, "_httpport", NULL, httpPort, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_httpport", NULL, httpPort, RMIL_CMDLINE); - } -#endif - if (signIt) { if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD || bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD) { @@ -1273,87 +1107,10 @@ int main(int argc, const char ** argv) case MODE_REBUILD: case MODE_RECOMPILE: - if (rpmGetVerbosity() == RPMMESS_NORMAL) - rpmSetVerbosity(RPMMESS_VERBOSE); - - if (!poptPeekArg(optCon)) - argerror(_("no packages files given for rebuild")); - - ba->buildAmount = RPMBUILD_PREP | RPMBUILD_BUILD | RPMBUILD_INSTALL; - if (bigMode == MODE_REBUILD) { - ba->buildAmount |= RPMBUILD_PACKAGEBINARY; - ba->buildAmount |= RPMBUILD_RMSOURCE; - ba->buildAmount |= RPMBUILD_RMSPEC; - ba->buildAmount |= RPMBUILD_CLEAN; - ba->buildAmount |= RPMBUILD_RMBUILD; - } - - while ((pkg = poptGetArg(optCon))) { - ec = rpmInstallSource("", pkg, &specFile, &cookie); - if (ec) - break; - - ba->rootdir = rootdir; - ec = build(specFile, ba, passPhrase, 0, cookie, rcfile, force, noDeps); - if (ec) - break; - free(cookie); - xfree(specFile); - } break; case MODE_BUILD: case MODE_TARBUILD: - if (rpmGetVerbosity() == RPMMESS_NORMAL) - rpmSetVerbosity(RPMMESS_VERBOSE); - - switch (ba->buildChar) { - /* these fallthroughs are intentional */ - case 'a': - ba->buildAmount |= RPMBUILD_PACKAGESOURCE; - /*@fallthrough@*/ - case 'b': - ba->buildAmount |= RPMBUILD_PACKAGEBINARY; - ba->buildAmount |= RPMBUILD_CLEAN; - /*@fallthrough@*/ - case 'i': - ba->buildAmount |= RPMBUILD_INSTALL; - if ((ba->buildChar == 'i') && ba->shortCircuit) - break; - /*@fallthrough@*/ - case 'c': - ba->buildAmount |= RPMBUILD_BUILD; - if ((ba->buildChar == 'c') && ba->shortCircuit) - break; - /*@fallthrough@*/ - case 'p': - ba->buildAmount |= RPMBUILD_PREP; - break; - - case 'l': - ba->buildAmount |= RPMBUILD_FILECHECK; - break; - case 's': - ba->buildAmount |= RPMBUILD_PACKAGESOURCE; - break; - } - - if (!poptPeekArg(optCon)) { - if (bigMode == MODE_BUILD) - argerror(_("no spec files given for build")); - else - argerror(_("no tar files given for build")); - } - - while ((pkg = poptGetArg(optCon))) { - ba->rootdir = rootdir; - ec = build(pkg, ba, passPhrase, bigMode == MODE_TARBUILD, - NULL, rcfile, force, noDeps); - if (ec) - break; - rpmFreeMacros(NULL); - rpmReadConfigFiles(rcfile, NULL); - } break; case MODE_UNINSTALL: @@ -1479,8 +1236,6 @@ int main(int argc, const char ** argv) freeFilesystems(); urlFreeCache(); if (qva->qva_queryFormat) xfree(qva->qva_queryFormat); - if (ba->buildRootOverride) xfree(ba->buildRootOverride); - if (ba->targets) free(ba->targets); #if HAVE_MCHECK_H && HAVE_MTRACE muntrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ diff --git a/rpm.spec b/rpm.spec index 3fe0d1a..40215f2 100644 --- a/rpm.spec +++ b/rpm.spec @@ -159,7 +159,6 @@ fi /usr/lib/rpm/mkinstalldirs /usr/lib/rpm/rpmdb /usr/lib/rpm/rpm[eiukqv] -/usr/lib/rpm/rpme /usr/lib/rpm/rpmpopt /usr/lib/rpm/rpmrc /usr/lib/rpm/vpkg-provides.sh diff --git a/rpmpopt.in b/rpmpopt.in index 0255032..67c4ee3 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -111,12 +111,25 @@ rpm alias --httpproxy --define '_httpproxy !#:+' rpm alias --timecheck --define '_timecheck !#:+' #============================================================================== -#rpm exec -b rpmb -b -#rpm exec --build rpmb --build -#rpm exec --rebuild rpmb --rebuild -#rpm exec --recompile rpmb --recompile -#rpm exec -t rpmt -t -#rpm exec --tarbuild rpmt --tarbuild +# Popt glue to preserve legacy CLI behavior. +# +# XXX popt exec parsing doesn't honor POPT_ARGFLAG_ONEDASH +rpm exec --bp rpmb -bp +rpm exec --bc rpmb -bc +rpm exec --bi rpmb -bi +rpm exec --bl rpmb -bl +rpm exec --ba rpmb -ba +rpm exec --bb rpmb -bb +rpm exec --bs rpmb -bs +rpm exec --tp rpmb -tp +rpm exec --tc rpmb -tc +rpm exec --ti rpmb -ti +rpm exec --tl rpmb -tl +rpm exec --ta rpmb -ta +rpm exec --tb rpmb -tb +rpm exec --ts rpmb -ts +rpm exec --rebuild rpmb --rebuild +rpm exec --recompile rpmb --recompile rpm exec --initdb rpmdb --initdb rpm exec --rebuilddb rpmdb --rebuilddb diff --git a/rpmqv.c b/rpmqv.c index 792f47f..0b9b3eb 100755 --- a/rpmqv.c +++ b/rpmqv.c @@ -1,11 +1,11 @@ #include "system.h" -#if 0 +#if defined(IAM_RPM) #define IAM_RPMBT -#undef IAM_RPMDB -#undef IAM_RPMEIU -#undef IAM_RPMQV -#undef IAM_RPMK +#define IAM_RPMDB +#define IAM_RPMEIU +#define IAM_RPMQV +#define IAM_RPMK #endif #include @@ -56,7 +56,6 @@ static int noPgp = 0; #ifdef IAM_RPMQV static struct rpmQVArguments rpmQVArgs; -static int queryTags = 0; #endif #if defined(IAM_RPMBT) || defined(IAM_RPMK) @@ -114,12 +113,6 @@ extern int rpmFLAGS; extern MacroContext rpmCLIMacroContext; /* options for all executables */ -#ifdef DYING -static char * ftpPort = NULL; -static char * ftpProxy = NULL; -static char * httpPort = NULL; -static char * httpProxy = NULL; -#endif static int help = 0; static int noUsageMsg = 0; @@ -176,16 +169,12 @@ static struct poptOption optionsTable[] = { { "test", '\0', 0, &test, 0, NULL, NULL}, #endif + /* XXX colliding options */ { "all", 'a', 0, 0, 'a', NULL, NULL}, - -#ifdef DYING - { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH, NULL, NULL}, - { "ftpport", '\0', POPT_ARG_STRING, &ftpPort, 0, NULL, NULL}, - { "ftpproxy", '\0', POPT_ARG_STRING, &ftpProxy, 0, NULL, NULL}, - { "httpport", '\0', POPT_ARG_STRING, &httpPort, 0, NULL, NULL}, - { "httpproxy", '\0', POPT_ARG_STRING, &httpProxy, 0, NULL, NULL}, -#endif /* DYING */ +#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT) { NULL, 'i', 0, 0, 'i', NULL, NULL}, +#endif + { "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0, NULL, NULL}, { "root", 'r', POPT_ARG_STRING, &rootdir, 0, NULL, NULL}, @@ -213,12 +202,14 @@ static struct poptOption optionsTable[] = { { "sign", '\0', 0, &signIt, 0, NULL, NULL}, #endif /* IAM_RPMBT || IAM_RPMK */ +#ifdef DYING #ifdef IAM_RPMBT { "build", 'b', POPT_ARG_STRING, 0, 'b', NULL, NULL}, { "rebuild", '\0', 0, 0, GETOPT_REBUILD, NULL, NULL}, { "recompile", '\0', 0, 0, GETOPT_RECOMPILE, NULL, NULL}, { "tarbuild", 't', POPT_ARG_STRING, 0, 't', NULL, NULL}, #endif /* IAM_RPMBT */ +#endif /* DYING */ #ifdef IAM_RPMDB { "initdb", '\0', 0, &initdb, 0, NULL, NULL}, @@ -253,10 +244,12 @@ static struct poptOption optionsTable[] = { #endif /* IAM_RPMEIU */ #ifdef IAM_RPMQV - { "query", 'q', 0, NULL, 'q', NULL, NULL}, +#ifdef DYING + { "query", 'q', 0, 0, 'q', NULL, NULL}, { "verify", 'V', 0, 0, 'V', NULL, NULL}, { NULL, 'y', 0, 0, 'V', NULL, NULL}, - { "querytags", '\0', 0, &queryTags, 0, NULL, NULL}, + { "querytags", '\0', 0, 0, 0, NULL, NULL}, +#endif { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0, (void *) &rpmQVArgs, NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, @@ -357,7 +350,7 @@ static void printUsage(void) { #endif /* IAM_RPMQV */ #ifdef IAM_RPMBT - fprintf(fp, _(" %s {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile ]\n"), __progname); + fprintf(fp, _(" %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile ]\n"), __progname); puts(_(" [--sign] [--nobuild] ]")); puts(_(" [--target=platform1[,platform2...]]")); puts(_(" [--rmsource] [--rmspec] specfile")); @@ -664,7 +657,6 @@ int main(int argc, const char ** argv) #ifdef IAM_RPMQV QVA_t *qva = &rpmQVArgs; enum rpmQVSources QVSource = RPMQV_PACKAGE; - const char * infoCommand[] = { "--info", NULL }; #endif #ifdef IAM_RPMBT @@ -675,7 +667,6 @@ int main(int argc, const char ** argv) rpmRelocation * relocations = NULL; int numRelocations = 0; int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0; - const char * installCommand[] = { "--install", NULL }; int probFilter = 0; int upgrade = 0; #endif @@ -787,12 +778,15 @@ 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_mode = ' '; + qva->qva_char = ' '; #endif #ifdef IAM_RPMBT if (ba->buildRootOverride) xfree(ba->buildRootOverride); if (ba->targets) free(ba->targets); memset(ba, 0, sizeof(*ba)); + ba->buildMode = ' '; ba->buildChar = ' '; #endif @@ -805,62 +799,27 @@ int main(int argc, const char ** argv) rpmIncreaseVerbosity(); break; +#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT) case 'i': #ifdef IAM_RPMQV - if (bigMode == MODE_QUERY) + if (bigMode == MODE_QUERY) { + const char * infoCommand[] = { "--info", NULL }; poptStuffArgs(optCon, infoCommand); + } #endif #ifdef IAM_RPMEIU if (bigMode == MODE_INSTALL) /*@-ifempty@*/ ; - if (bigMode == MODE_UNKNOWN) + if (bigMode == MODE_UNKNOWN) { + const char * installCommand[] = { "--install", NULL }; poptStuffArgs(optCon, installCommand); -#endif -#ifdef IAM_RPMBT - ba->buildChar = 'i'; + } #endif break; +#endif /* IAM_RPMQV || IAM_RPMEIU || IAM_RPMBT */ +#ifdef DYING #ifdef IAM_RPMBT - case 'b': - case 't': - { const char * errString = NULL; - if (bigMode != MODE_UNKNOWN && bigMode != MODE_BUILD) - argerror(_("only one major mode may be specified")); - - if (arg == 'b') { - bigMode = MODE_BUILD; - errString = _("--build (-b) requires one of a,b,i,c,p,l as " - "its sole argument"); - } else { - bigMode = MODE_TARBUILD; - errString = _("--tarbuild (-t) requires one of a,b,i,c,p,l as " - "its sole argument"); - } - - if (strlen(optArg) > 1) - argerror(errString); - - ba->buildChar = optArg[0]; - switch (ba->buildChar) { - case 'a': - case 'b': - case 'i': - case 'c': - case 'p': - case 'l': - case 's': - break; - default: - argerror(errString); - break; - } - } break; - - case 'a': - ba->buildChar = 'a'; - break; - case GETOPT_REBUILD: if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILD) argerror(_("only one major mode may be specified")); @@ -873,6 +832,7 @@ int main(int argc, const char ** argv) bigMode = MODE_RECOMPILE; break; #endif /* IAM_RPMBT */ +#endif /* DYING */ #ifdef IAM_RPMEIU case 'u': @@ -1003,20 +963,6 @@ int main(int argc, const char ** argv) break; #endif /* IAM_RPMK */ - case GETOPT_DBPATH: - switch (urlIsURL(optArg)) { - case URL_IS_UNKNOWN: - if (optArg[0] != '/') - argerror(_("arguments to --dbpath must begin with a /")); - break; - default: - break; - } - addMacro(NULL, "_dbpath", NULL, optArg, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_dbpath", NULL, optArg, RMIL_CMDLINE); - gotDbpath = 1; - break; - case GETOPT_DEFINEMACRO: rpmDefineMacro(NULL, optArg, RMIL_CMDLINE); rpmDefineMacro(&rpmCLIMacroContext, optArg, RMIL_CMDLINE); @@ -1050,11 +996,19 @@ int main(int argc, const char ** argv) } #ifdef IAM_RPMBT + switch (ba->buildMode) { + case 'b': bigMode = MODE_BUILD; break; + case 't': bigMode = MODE_TARBUILD; break; + case 'B': bigMode = MODE_REBUILD; break; + case 'C': bigMode = MODE_RECOMPILE; break; + } + if ((ba->buildAmount & RPMBUILD_RMSOURCE) && bigMode == MODE_UNKNOWN) bigMode = MODE_BUILD; if ((ba->buildAmount & RPMBUILD_RMSPEC) && bigMode == MODE_UNKNOWN) bigMode = MODE_BUILD; + #endif /* IAM_RPMBT */ #ifdef IAM_RPMDB @@ -1067,12 +1021,20 @@ int main(int argc, const char ** argv) #endif /* IAM_RPMDB */ #ifdef IAM_RPMQV + switch (qva->qva_mode) { + case 'q': bigMode = MODE_QUERY; break; + case 'V': bigMode = MODE_VERIFY; break; + case 'Q': bigMode = MODE_QUERYTAGS; break; + } + +#ifdef DYING if (queryTags) { if (bigMode != MODE_UNKNOWN) argerror(_("only one major mode may be specified")); else bigMode = MODE_QUERYTAGS; } +#endif if (qva->qva_sourceCount) { if (QVSource != RPMQV_PACKAGE || qva->qva_sourceCount > 1) @@ -1236,36 +1198,6 @@ int main(int argc, const char ** argv) argerror(_("--oldpackage may only be used during upgrades")); #endif -#ifdef DYING - if ((ftpProxy || ftpPort) && !( -#ifdef IAM_RPMEIU - bigMode == MODE_INSTALL || -#endif -#ifdef IAM_RPMQV - ((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) || - ((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM)) -#else - 0 -#endif - )) - argerror(_("ftp options can only be used during package queries, " - "installs, and upgrades")); - - if ((httpProxy || httpPort) && !( -#ifdef IAM_RPMEIU - bigMode == MODE_INSTALL || -#endif -#ifdef IAM_RPMQV - ((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) || - ((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM)) -#else - 0 -#endif - )) - argerror(_("http options can only be used during package queries, " - "installs, and upgrades")); -#endif /* DYING */ - #ifdef IAM_RPMK if (noPgp && bigMode != MODE_CHECKSIG) argerror(_("--nopgp may only be used during signature checking")); @@ -1280,25 +1212,6 @@ int main(int argc, const char ** argv) "package verification")); #endif -#ifdef DYING - if (ftpProxy) { - addMacro(NULL, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE); - } - if (ftpPort) { - addMacro(NULL, "_ftpport", NULL, ftpPort, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_ftpport", NULL, ftpPort, RMIL_CMDLINE); - } - if (httpProxy) { - addMacro(NULL, "_httpproxy", NULL, httpProxy, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_httpproxy", NULL, httpProxy, RMIL_CMDLINE); - } - if (httpPort) { - addMacro(NULL, "_httpport", NULL, httpPort, RMIL_CMDLINE); - addMacro(&rpmCLIMacroContext, "_httpport", NULL, httpPort, RMIL_CMDLINE); - } -#endif /* DYING */ - #if defined(IAM_RPMBT) || defined(IAM_RPMK) if (signIt) { if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD || -- 2.7.4