From 4d888092960c6160f86dff474b2bf9e89f106d5e Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 23 Jun 2000 00:49:43 +0000 Subject: [PATCH] - python: initdb binding (Dan Burcaw ). - internalize --freshen (Gordon Messmer ). CVS patchset: 3905 CVS date: 2000/06/23 00:49:43 --- CHANGES | 4 +- lib/rpminstall.c | 10 + lib/rpmlib.h | 1 + po/rpm.pot | 677 ++++++++++++++++++++++++++-------------------------- rpm.c | 11 + rpm.spec | 3 + rpmpopt.in | 2 - rpmqv.c | 11 + scripts/Makefile.am | 4 +- scripts/Makefile.in | 4 +- scripts/freshen.sh | 52 ---- 11 files changed, 382 insertions(+), 397 deletions(-) delete mode 100755 scripts/freshen.sh diff --git a/CHANGES b/CHANGES index 7e0b0cb..7fd7656 100644 --- a/CHANGES +++ b/CHANGES @@ -67,7 +67,6 @@ - API: uncouple fadio from rest of rpmio. - API: externalize legacy fdOpen interface for rpmfind et al. - put version on rpmpopt filename to avoid legacy filename collision. - - python: initdb binding (Dan Burcaw ). 3.0.4 -> 3.0.5 - handle version 4 packaging as input. @@ -84,6 +83,9 @@ - fix: don't expand macros in false branch of %if (kasal@suse.cz). - fix: macro expansion problem and clean up (#11484) (kasal@suse.cz). - uname on i370 has s390 as arch (#11456). + - python: initdb binding (Dan Burcaw ). + - internalize --freshen (Gordon Messmer ). + 3.0.3 -> 3.0.4 - use compressed filenames on install side. diff --git a/lib/rpminstall.c b/lib/rpminstall.c index a86fe21..982922a 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -277,6 +277,16 @@ int rpmInstall(const char * rootdir, const char ** fileArgv, int transFlags, } } + /* If this is a freshen operation, verify a package is installed */ + if (interfaceFlags & INSTALL_FRESHEN) { + const char * name; + + headerNVR(h, &name, NULL, NULL); + if (rpmdbCountPackages(db, name) == 0) + break; + /* Package exists, OK to freshen */ + } + rc = rpmtransAddPackage(rpmdep, h, NULL, fileName, (interfaceFlags & INSTALL_UPGRADE) != 0, relocations); diff --git a/lib/rpmlib.h b/lib/rpmlib.h index bb09943..8b2fa16 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -887,6 +887,7 @@ int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg); #define INSTALL_NOORDER (1 << 3) #define INSTALL_LABEL (1 << 4) /* set if we're being verbose */ #define INSTALL_UPGRADE (1 << 5) +#define INSTALL_FRESHEN (1 << 6) #define UNINSTALL_NODEPS (1 << 0) #define UNINSTALL_ALLMATCHES (1 << 1) diff --git a/po/rpm.pot b/po/rpm.pot index 16151e4..410fa45 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-21 19:14-0400\n" +"POT-Creation-Date: 2000-06-22 19:02-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:425 +#: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:435 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -107,1038 +107,1039 @@ msgstr "" msgid "no copyright!\n" msgstr "" -#: rpm.c:177 rpmqv.c:256 +#: rpm.c:178 rpmqv.c:257 #, c-format msgid "rpm: %s\n" msgstr "" -#: rpm.c:188 rpmqv.c:267 +#: rpm.c:189 rpmqv.c:268 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpm.c:192 rpmqv.c:271 +#: rpm.c:193 rpmqv.c:272 msgid "Copyright (C) 1998 - Red Hat Software" msgstr "" -#: rpm.c:193 rpmqv.c:272 +#: rpm.c:194 rpmqv.c:273 msgid "This may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpm.c:201 +#: rpm.c:202 msgid "Usage: rpm {--help}" msgstr "" -#: rpm.c:202 +#: rpm.c:203 msgid " rpm {--version}" msgstr "" -#: rpm.c:203 +#: rpm.c:204 msgid " rpm {--initdb} [--dbpath ]" msgstr "" -#: rpm.c:204 +#: rpm.c:205 msgid "" " rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:205 rpmqv.c:293 +#: rpm.c:206 rpmqv.c:294 msgid " [--replacepkgs] [--replacefiles] [--root ]" msgstr "" -#: rpm.c:206 rpmqv.c:294 +#: rpm.c:207 rpmqv.c:295 msgid " [--excludedocs] [--includedocs] [--noscripts]" msgstr "" -#: rpm.c:207 rpmqv.c:295 +#: rpm.c:208 rpmqv.c:296 msgid "" " [--rcfile ] [--ignorearch] [--dbpath ]" msgstr "" -#: rpm.c:208 rpmqv.c:296 +#: rpm.c:209 rpmqv.c:297 msgid "" " [--prefix ] [--ignoreos] [--nodeps] [--allfiles]" msgstr "" -#: rpm.c:209 rpmqv.c:297 +#: rpm.c:210 rpmqv.c:298 msgid "" " [--ftpproxy ] [--ftpport ] [--justdb]" msgstr "" -#: rpm.c:210 rpm.c:219 rpm.c:228 rpmqv.c:298 rpmqv.c:307 rpmqv.c:322 +#: rpm.c:211 rpm.c:220 rpm.c:229 rpmqv.c:299 rpmqv.c:308 rpmqv.c:323 msgid " [--httpproxy ] [--httpport ] " msgstr "" -#: rpm.c:211 rpm.c:221 rpmqv.c:299 rpmqv.c:309 +#: rpm.c:212 rpm.c:222 rpmqv.c:300 rpmqv.c:310 msgid " [--noorder] [--relocate oldpath=newpath]" msgstr "" -#: rpm.c:212 rpmqv.c:300 +#: rpm.c:213 rpmqv.c:301 msgid "" " [--badreloc] [--notriggers] [--excludepath ]" msgstr "" -#: rpm.c:213 rpmqv.c:301 +#: rpm.c:214 rpmqv.c:302 msgid " [--ignoresize] file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:214 +#: rpm.c:215 msgid "" " rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:215 rpmqv.c:303 +#: rpm.c:216 rpmqv.c:304 msgid " [--oldpackage] [--root ] [--noscripts]" msgstr "" -#: rpm.c:216 rpmqv.c:304 +#: rpm.c:217 rpmqv.c:305 msgid "" " [--excludedocs] [--includedocs] [--rcfile ]" msgstr "" -#: rpm.c:217 rpmqv.c:305 +#: rpm.c:218 rpmqv.c:306 msgid "" " [--ignorearch] [--dbpath ] [--prefix ] " msgstr "" -#: rpm.c:218 rpmqv.c:306 +#: rpm.c:219 rpmqv.c:307 msgid " [--ftpproxy ] [--ftpport ]" msgstr "" -#: rpm.c:220 rpmqv.c:308 +#: rpm.c:221 rpmqv.c:309 msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]" msgstr "" -#: rpm.c:222 rpmqv.c:310 +#: rpm.c:223 rpmqv.c:311 msgid "" " [--badreloc] [--excludepath ] [--ignoresize]" msgstr "" -#: rpm.c:223 rpmqv.c:311 +#: rpm.c:224 rpmqv.c:312 msgid " file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:224 +#: rpm.c:225 msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]" msgstr "" -#: rpm.c:225 rpmqv.c:319 +#: rpm.c:226 rpmqv.c:320 msgid " [--scripts] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:226 rpmqv.c:320 +#: rpm.c:227 rpmqv.c:321 msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" -#: rpm.c:227 rpmqv.c:321 +#: rpm.c:228 rpmqv.c:322 msgid "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" msgstr "" -#: rpm.c:229 rpmqv.c:323 +#: rpm.c:230 rpmqv.c:324 msgid "" " [--ftpport ] [--provides] [--triggers] [--dump]" msgstr "" -#: rpm.c:230 rpmqv.c:324 +#: rpm.c:231 rpmqv.c:325 msgid " [--changelog] [--dbpath ] [targets]" msgstr "" -#: rpm.c:231 +#: rpm.c:232 msgid " rpm {--verify -V -y} [-afpg] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:232 rpmqv.c:326 +#: rpm.c:233 rpmqv.c:327 msgid "" " [--dbpath ] [--nodeps] [--nofiles] [--noscripts]" msgstr "" -#: rpm.c:233 rpmqv.c:327 +#: rpm.c:234 rpmqv.c:328 msgid " [--nomd5] [targets]" msgstr "" -#: rpm.c:234 +#: rpm.c:235 msgid " rpm {--setperms} [-afpg] [target]" msgstr "" -#: rpm.c:235 +#: rpm.c:236 msgid " rpm {--setugids} [-afpg] [target]" msgstr "" -#: rpm.c:236 +#: rpm.c:237 msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:237 +#: rpm.c:238 msgid " rpm {--erase -e} [--root ] [--noscripts] [--rcfile ]" msgstr "" -#: rpm.c:238 rpmqv.c:313 +#: rpm.c:239 rpmqv.c:314 msgid " [--dbpath ] [--nodeps] [--allmatches]" msgstr "" -#: rpm.c:239 rpmqv.c:314 +#: rpm.c:240 rpmqv.c:315 msgid "" " [--justdb] [--notriggers] rpackage1 ... packageN" msgstr "" -#: rpm.c:240 +#: rpm.c:241 msgid "" " rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " "]" msgstr "" -#: rpm.c:241 +#: rpm.c:242 msgid " [--sign] [--nobuild] [--timecheck ] ]" msgstr "" -#: rpm.c:242 rpmqv.c:336 +#: rpm.c:243 rpmqv.c:337 msgid " [--target=platform1[,platform2...]]" msgstr "" -#: rpm.c:243 rpmqv.c:337 +#: rpm.c:244 rpmqv.c:338 msgid " [--rmsource] [--rmspec] specfile" msgstr "" -#: rpm.c:244 +#: rpm.c:245 msgid " rpm {--rmsource} [--rcfile ] [-v] specfile" msgstr "" -#: rpm.c:245 +#: rpm.c:246 msgid "" " rpm {--rebuild} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:246 +#: rpm.c:247 msgid "" " rpm {--recompile} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:247 +#: rpm.c:248 msgid " rpm {--resign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:248 +#: rpm.c:249 msgid " rpm {--addsign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:249 +#: rpm.c:250 msgid "" " rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile ]" msgstr "" -#: rpm.c:250 rpmqv.c:348 +#: rpm.c:251 rpmqv.c:349 msgid " package1 ... packageN" msgstr "" -#: rpm.c:251 +#: rpm.c:252 msgid " rpm {--rebuilddb} [--rcfile ] [--dbpath ]" msgstr "" -#: rpm.c:252 +#: rpm.c:253 msgid " rpm {--querytags}" msgstr "" -#: rpm.c:286 rpmqv.c:384 +#: rpm.c:287 rpmqv.c:385 msgid "Usage:" msgstr "" -#: rpm.c:288 rpmqv.c:386 +#: rpm.c:289 rpmqv.c:387 msgid "print this message" msgstr "" -#: rpm.c:290 rpmqv.c:388 +#: rpm.c:291 rpmqv.c:389 msgid "print the version of rpm being used" msgstr "" -#: rpm.c:293 +#: rpm.c:294 msgid " All modes support the following arguments:" msgstr "" -#: rpm.c:294 +#: rpm.c:295 msgid " --define ' '" msgstr "" -#: rpm.c:295 rpmqv.c:393 +#: rpm.c:296 rpmqv.c:394 msgid "define macro with value " msgstr "" -#: rpm.c:296 +#: rpm.c:297 msgid " --eval '+' " msgstr "" -#: rpm.c:297 rpmqv.c:395 +#: rpm.c:298 rpmqv.c:396 msgid "print the expansion of macro to stdout" msgstr "" -#: rpm.c:298 +#: rpm.c:299 msgid " --pipe " msgstr "" -#: rpm.c:299 rpmqv.c:397 +#: rpm.c:300 rpmqv.c:398 msgid "send stdout to " msgstr "" -#: rpm.c:300 +#: rpm.c:301 msgid " --rcfile " msgstr "" -#: rpm.c:301 rpmqv.c:399 +#: rpm.c:302 rpmqv.c:400 msgid "use instead of /etc/rpmrc and $HOME/.rpmrc" msgstr "" -#: rpm.c:303 rpmqv.c:401 +#: rpm.c:304 rpmqv.c:402 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpm.c:305 rpmqv.c:409 +#: rpm.c:306 rpmqv.c:410 msgid "be a little more verbose" msgstr "" -#: rpm.c:307 rpmqv.c:411 +#: rpm.c:308 rpmqv.c:412 msgid "be incredibly verbose (for debugging)" msgstr "" -#: rpm.c:310 +#: rpm.c:311 msgid " Install, upgrade and query (with -p) allow URL's to be used in place" msgstr "" -#: rpm.c:311 +#: rpm.c:312 msgid " of file names as well as the following options:" msgstr "" -#: rpm.c:312 +#: rpm.c:313 msgid " --ftpproxy " msgstr "" -#: rpm.c:313 rpmqv.c:418 +#: rpm.c:314 rpmqv.c:419 msgid "hostname or IP of ftp proxy" msgstr "" -#: rpm.c:314 +#: rpm.c:315 msgid " --ftpport " msgstr "" -#: rpm.c:315 rpmqv.c:420 +#: rpm.c:316 rpmqv.c:421 msgid "port number of ftp server (or proxy)" msgstr "" -#: rpm.c:316 +#: rpm.c:317 msgid " --httpproxy " msgstr "" -#: rpm.c:317 rpmqv.c:422 +#: rpm.c:318 rpmqv.c:423 msgid "hostname or IP of http proxy" msgstr "" -#: rpm.c:318 +#: rpm.c:319 msgid " --httpport " msgstr "" -#: rpm.c:319 rpmqv.c:424 +#: rpm.c:320 rpmqv.c:425 msgid "port number of http server (or proxy)" msgstr "" -#: rpm.c:323 rpmqv.c:444 +#: rpm.c:324 rpmqv.c:445 msgid "query mode" msgstr "" -#: rpm.c:324 rpm.c:370 rpm.c:395 rpm.c:447 rpm.c:521 +#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522 msgid " --dbpath " msgstr "" -#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522 rpmqv.c:404 +#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:405 msgid "use as the directory for the database" msgstr "" -#: rpm.c:326 +#: rpm.c:327 msgid " --queryformat " msgstr "" -#: rpm.c:327 rpmqv.c:446 +#: rpm.c:328 rpmqv.c:447 msgid "use as the header format (implies --info)" msgstr "" -#: rpm.c:328 rpm.c:372 rpm.c:430 rpm.c:459 +#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460 msgid " --root " msgstr "" -#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460 rpm.c:524 rpmqv.c:406 +#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:407 msgid "use as the top level directory" msgstr "" -#: rpm.c:330 +#: rpm.c:331 msgid " Package specification options:" msgstr "" -#: rpm.c:332 +#: rpm.c:333 msgid "query all packages" msgstr "" -#: rpm.c:333 +#: rpm.c:334 msgid " -f + " msgstr "" -#: rpm.c:334 +#: rpm.c:335 msgid "query package owning " msgstr "" -#: rpm.c:335 +#: rpm.c:336 msgid " -p + " msgstr "" -#: rpm.c:336 +#: rpm.c:337 msgid "query (uninstalled) package " msgstr "" -#: rpm.c:337 +#: rpm.c:338 msgid " --triggeredby " msgstr "" -#: rpm.c:338 +#: rpm.c:339 msgid "query packages triggered by " msgstr "" -#: rpm.c:339 +#: rpm.c:340 msgid " --whatprovides " msgstr "" -#: rpm.c:340 +#: rpm.c:341 msgid "query packages which provide capability" msgstr "" -#: rpm.c:341 +#: rpm.c:342 msgid " --whatrequires " msgstr "" -#: rpm.c:342 +#: rpm.c:343 msgid "query packages which require capability" msgstr "" -#: rpm.c:343 +#: rpm.c:344 msgid " Information selection options:" msgstr "" -#: rpm.c:345 rpmqv.c:450 +#: rpm.c:346 rpmqv.c:451 msgid "display package information" msgstr "" -#: rpm.c:347 rpmqv.c:452 +#: rpm.c:348 rpmqv.c:453 msgid "display the package's change log" msgstr "" -#: rpm.c:349 rpmqv.c:454 +#: rpm.c:350 rpmqv.c:455 msgid "display package file list" msgstr "" -#: rpm.c:351 rpmqv.c:456 +#: rpm.c:352 rpmqv.c:457 msgid "show file states (implies -l)" msgstr "" -#: rpm.c:353 rpmqv.c:458 +#: rpm.c:354 rpmqv.c:459 msgid "list only documentation files (implies -l)" msgstr "" -#: rpm.c:355 rpmqv.c:460 +#: rpm.c:356 rpmqv.c:461 msgid "list only configuration files (implies -l)" msgstr "" -#: rpm.c:357 rpmqv.c:462 +#: rpm.c:358 rpmqv.c:463 msgid "" "show all verifiable information for each file (must be used with -l, -c, or " "-d)" msgstr "" -#: rpm.c:359 +#: rpm.c:360 msgid "list capabilities package provides" msgstr "" -#: rpm.c:361 +#: rpm.c:362 msgid "list package dependencies" msgstr "" -#: rpm.c:363 +#: rpm.c:364 msgid "print the various [un]install scripts" msgstr "" -#: rpm.c:365 +#: rpm.c:366 msgid "show the trigger scripts contained in the package" msgstr "" -#: rpm.c:369 rpmqv.c:473 +#: rpm.c:370 rpmqv.c:474 msgid "" "verify a package installation using the same same package specification " "options as -q" msgstr "" -#: rpm.c:375 rpm.c:417 rpm.c:452 rpmqv.c:475 rpmqv.c:521 rpmqv.c:555 +#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:476 rpmqv.c:522 rpmqv.c:556 msgid "do not verify package dependencies" msgstr "" -#: rpm.c:377 rpmqv.c:477 +#: rpm.c:378 rpmqv.c:478 msgid "do not verify file md5 checksums" msgstr "" -#: rpm.c:379 rpmqv.c:479 +#: rpm.c:380 rpmqv.c:480 msgid "do not verify file attributes" msgstr "" -#: rpm.c:381 rpmqv.c:482 +#: rpm.c:382 rpmqv.c:483 msgid "list the tags that can be used in a query format" msgstr "" -#: rpm.c:384 +#: rpm.c:385 msgid " --install " msgstr "" -#: rpm.c:385 +#: rpm.c:386 msgid " -i " msgstr "" -#: rpm.c:386 rpmqv.c:496 +#: rpm.c:387 rpmqv.c:497 msgid "install package" msgstr "" -#: rpm.c:387 +#: rpm.c:388 msgid " --excludepath " msgstr "" -#: rpm.c:388 +#: rpm.c:389 msgid "skip files in path " msgstr "" -#: rpm.c:389 +#: rpm.c:390 msgid " --relocate =" msgstr "" -#: rpm.c:390 rpmqv.c:533 +#: rpm.c:391 rpmqv.c:534 msgid "relocate files from to " msgstr "" -#: rpm.c:392 rpmqv.c:501 +#: rpm.c:393 rpmqv.c:502 msgid "relocate files in non-relocateable package" msgstr "" -#: rpm.c:393 +#: rpm.c:394 msgid " --prefix " msgstr "" -#: rpm.c:394 rpmqv.c:531 +#: rpm.c:395 rpmqv.c:532 msgid "relocate the package to , if relocatable" msgstr "" -#: rpm.c:398 rpmqv.c:503 +#: rpm.c:399 rpmqv.c:504 msgid "do not install documentation" msgstr "" -#: rpm.c:400 rpmqv.c:507 +#: rpm.c:401 rpmqv.c:508 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: rpm.c:402 rpmqv.c:509 +#: rpm.c:403 rpmqv.c:510 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: rpm.c:404 rpmqv.c:498 +#: rpm.c:405 rpmqv.c:499 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: rpm.c:407 rpmqv.c:511 +#: rpm.c:408 rpmqv.c:512 msgid "don't verify package architecture" msgstr "" -#: rpm.c:409 rpmqv.c:513 +#: rpm.c:410 rpmqv.c:514 msgid "don't check disk space before installing" msgstr "" -#: rpm.c:411 rpmqv.c:515 +#: rpm.c:412 rpmqv.c:516 msgid "don't verify package operating system" msgstr "" -#: rpm.c:413 rpmqv.c:517 +#: rpm.c:414 rpmqv.c:518 msgid "install documentation" msgstr "" -#: rpm.c:415 rpm.c:450 rpmqv.c:519 rpmqv.c:553 +#: rpm.c:416 rpm.c:451 rpmqv.c:520 rpmqv.c:554 msgid "update the database, but do not modify the filesystem" msgstr "" -#: rpm.c:419 rpm.c:454 rpmqv.c:523 rpmqv.c:557 +#: rpm.c:420 rpm.c:455 rpmqv.c:524 rpmqv.c:558 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: rpm.c:421 +#: rpm.c:422 msgid "don't execute any installation scripts" msgstr "" -#: rpm.c:423 rpm.c:458 rpmqv.c:561 +#: rpm.c:424 rpm.c:459 rpmqv.c:562 msgid "don't execute any scripts triggered by this package" msgstr "" -#: rpm.c:425 rpmqv.c:529 +#: rpm.c:426 rpmqv.c:530 msgid "print percentages as package installs" msgstr "" -#: rpm.c:427 rpmqv.c:535 +#: rpm.c:428 rpmqv.c:536 msgid "install even if the package replaces installed files" msgstr "" -#: rpm.c:429 rpmqv.c:537 +#: rpm.c:430 rpmqv.c:538 msgid "reinstall if the package is already present" msgstr "" -#: rpm.c:433 rpmqv.c:539 +#: rpm.c:434 rpmqv.c:540 msgid "don't install, but tell if it would work or not" msgstr "" -#: rpm.c:436 +#: rpm.c:437 msgid " --upgrade " msgstr "" -#: rpm.c:437 +#: rpm.c:438 msgid " -U " msgstr "" -#: rpm.c:438 rpmqv.c:543 +#: rpm.c:439 rpmqv.c:544 msgid "upgrade package (same options as --install, plus)" msgstr "" -#: rpm.c:440 rpmqv.c:545 +#: rpm.c:441 rpmqv.c:546 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: rpm.c:442 +#: rpm.c:443 msgid " --erase " msgstr "" -#: rpm.c:444 rpmqv.c:549 +#: rpm.c:445 rpmqv.c:550 msgid "erase (uninstall) package" msgstr "" -#: rpm.c:446 rpmqv.c:551 +#: rpm.c:447 rpmqv.c:552 msgid "" "remove all packages which match (normally an error is generated if " " specified multiple packages)" msgstr "" -#: rpm.c:456 rpmqv.c:559 +#: rpm.c:457 rpmqv.c:560 msgid "do not execute any package specific scripts" msgstr "" -#: rpm.c:462 +#: rpm.c:463 msgid " -b " msgstr "" -#: rpm.c:463 +#: rpm.c:464 msgid " -t " msgstr "" -#: rpm.c:464 rpmqv.c:568 +#: rpm.c:465 rpmqv.c:569 msgid "build package, where is one of:" msgstr "" -#: rpm.c:466 rpmqv.c:570 +#: rpm.c:467 rpmqv.c:571 msgid "prep (unpack sources and apply patches)" msgstr "" -#: rpm.c:468 rpmqv.c:572 +#: rpm.c:469 rpmqv.c:573 #, c-format msgid "list check (do some cursory checks on %files)" msgstr "" -#: rpm.c:470 rpmqv.c:574 +#: rpm.c:471 rpmqv.c:575 msgid "compile (prep and compile)" msgstr "" -#: rpm.c:472 rpmqv.c:576 +#: rpm.c:473 rpmqv.c:577 msgid "install (prep, compile, install)" msgstr "" -#: rpm.c:474 rpmqv.c:578 +#: rpm.c:475 rpmqv.c:579 msgid "binary package (prep, compile, install, package)" msgstr "" -#: rpm.c:476 rpmqv.c:580 +#: rpm.c:477 rpmqv.c:581 msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: lib/poptBT.c:155 rpm.c:478 rpmqv.c:584 +#: lib/poptBT.c:155 rpm.c:479 rpmqv.c:585 msgid "skip straight to specified stage (only for c,i)" msgstr "" -#: lib/poptBT.c:145 rpm.c:480 rpmqv.c:586 +#: lib/poptBT.c:145 rpm.c:481 rpmqv.c:587 msgid "remove build tree when done" msgstr "" -#: lib/poptBT.c:151 rpm.c:482 rpmqv.c:588 +#: lib/poptBT.c:151 rpm.c:483 rpmqv.c:589 msgid "remove sources when done" msgstr "" -#: rpm.c:484 rpmqv.c:590 +#: rpm.c:485 rpmqv.c:591 msgid "remove spec file when done" msgstr "" -#: rpm.c:486 rpmqv.c:592 +#: rpm.c:487 rpmqv.c:593 msgid "generate PGP/GPG signature" msgstr "" -#: rpm.c:487 +#: rpm.c:488 msgid " --buildroot " msgstr "" -#: rpm.c:488 rpmqv.c:594 +#: rpm.c:489 rpmqv.c:595 msgid "use as the build root" msgstr "" -#: rpm.c:489 +#: rpm.c:490 msgid " --target=+" msgstr "" -#: rpm.c:490 rpmqv.c:596 +#: rpm.c:491 rpmqv.c:597 msgid "build the packages for the build targets platform1...platformN." msgstr "" -#: rpm.c:492 rpmqv.c:598 +#: rpm.c:493 rpmqv.c:599 msgid "do not execute any stages" msgstr "" -#: rpm.c:493 +#: rpm.c:494 msgid " --timecheck " msgstr "" -#: rpm.c:494 +#: rpm.c:495 msgid "set the time check to seconds (0 disables)" msgstr "" -#: rpm.c:496 +#: rpm.c:497 msgid " --rebuild " msgstr "" -#: rpm.c:497 rpmqv.c:601 +#: rpm.c:498 rpmqv.c:602 msgid "" "install source package, build binary package and remove spec file, sources, " "patches, and icons." msgstr "" -#: rpm.c:498 +#: rpm.c:499 msgid " --recompile " msgstr "" -#: rpm.c:499 rpmqv.c:603 +#: rpm.c:500 rpmqv.c:604 msgid "like --rebuild, but don't build any package" msgstr "" -#: rpm.c:502 +#: rpm.c:503 msgid " --resign + " msgstr "" -#: rpm.c:503 rpmqv.c:609 +#: rpm.c:504 rpmqv.c:610 msgid "sign a package (discard current signature)" msgstr "" -#: rpm.c:504 +#: rpm.c:505 msgid " --addsign + " msgstr "" -#: rpm.c:505 rpmqv.c:611 +#: rpm.c:506 rpmqv.c:612 msgid "add a signature to a package" msgstr "" -#: rpm.c:506 +#: rpm.c:507 msgid " --checksig +" msgstr "" -#: rpm.c:507 +#: rpm.c:508 msgid " -K + " msgstr "" -#: rpm.c:508 rpmqv.c:615 +#: rpm.c:509 rpmqv.c:616 msgid "verify package signature" msgstr "" -#: rpm.c:510 rpmqv.c:617 +#: rpm.c:511 rpmqv.c:618 msgid "skip any PGP signatures" msgstr "" -#: rpm.c:512 rpmqv.c:619 +#: rpm.c:513 rpmqv.c:620 msgid "skip any GPG signatures" msgstr "" -#: rpm.c:514 rpmqv.c:621 +#: rpm.c:515 rpmqv.c:622 msgid "skip any MD5 signatures" msgstr "" -#: rpm.c:518 +#: rpm.c:519 msgid "make sure a valid database exists" msgstr "" -#: rpm.c:520 +#: rpm.c:521 msgid "rebuild database from existing database" msgstr "" -#: rpm.c:528 rpmqv.c:484 +#: rpm.c:529 rpmqv.c:485 msgid "" "set the file permissions to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:531 rpmqv.c:487 +#: rpm.c:532 rpmqv.c:488 msgid "" "set the file owner and group to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:668 rpm.c:674 rpm.c:683 rpm.c:705 rpm.c:711 rpm.c:718 rpm.c:726 -#: rpm.c:747 rpm.c:804 rpmqv.c:805 rpmqv.c:814 rpmqv.c:820 rpmqv.c:826 -#: rpmqv.c:860 rpmqv.c:868 rpmqv.c:874 rpmqv.c:882 rpmqv.c:944 +#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728 +#: rpm.c:736 rpm.c:757 rpm.c:814 rpmqv.c:807 rpmqv.c:816 rpmqv.c:822 +#: rpmqv.c:828 rpmqv.c:835 rpmqv.c:870 rpmqv.c:878 rpmqv.c:884 rpmqv.c:892 +#: rpmqv.c:954 msgid "only one major mode may be specified" msgstr "" -#: rpm.c:676 rpmqv.c:807 +#: rpm.c:678 rpmqv.c:809 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: rpm.c:678 rpmqv.c:809 +#: rpm.c:680 rpmqv.c:811 msgid "Use -e or --erase instead.\n" msgstr "" -#: rpm.c:753 rpmqv.c:844 +#: rpm.c:763 rpmqv.c:854 msgid "relocations must begin with a /" msgstr "" -#: rpm.c:755 rpmqv.c:846 +#: rpm.c:765 rpmqv.c:856 msgid "relocations must contain a =" msgstr "" -#: rpm.c:758 rpmqv.c:849 +#: rpm.c:768 rpmqv.c:859 msgid "relocations must have a / following the =" msgstr "" -#: rpm.c:767 rpmqv.c:833 +#: rpm.c:777 rpmqv.c:843 msgid "exclude paths must begin with a /" msgstr "" -#: rpm.c:776 rpmqv.c:903 +#: rpm.c:786 rpmqv.c:913 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpm.c:811 rpmqv.c:959 +#: rpm.c:821 rpmqv.c:969 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpm.c:816 rpmqv.c:963 +#: rpm.c:826 rpmqv.c:973 msgid "unexpected query flags" msgstr "" -#: rpm.c:819 rpmqv.c:966 +#: rpm.c:829 rpmqv.c:976 msgid "unexpected query format" msgstr "" -#: rpm.c:822 rpmqv.c:969 +#: rpm.c:832 rpmqv.c:979 msgid "unexpected query source" msgstr "" -#: rpm.c:825 rpmqv.c:989 +#: rpm.c:835 rpmqv.c:999 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpm.c:828 rpmqv.c:994 +#: rpm.c:838 rpmqv.c:1004 msgid "files may only be relocated during package installation" msgstr "" -#: rpm.c:831 rpmqv.c:997 +#: rpm.c:841 rpmqv.c:1007 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpm.c:834 rpmqv.c:1000 +#: rpm.c:844 rpmqv.c:1010 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpm.c:837 rpmqv.c:1003 +#: rpm.c:847 rpmqv.c:1013 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpm.c:840 rpmqv.c:1006 +#: rpm.c:850 rpmqv.c:1016 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpm.c:843 rpmqv.c:1009 +#: rpm.c:853 rpmqv.c:1019 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpm.c:847 rpmqv.c:1013 +#: rpm.c:857 rpmqv.c:1023 msgid "--percent may only be specified during package installation" msgstr "" -#: rpm.c:851 rpmqv.c:1017 +#: rpm.c:861 rpmqv.c:1027 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpm.c:855 rpmqv.c:1021 +#: rpm.c:865 rpmqv.c:1031 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpm.c:859 rpmqv.c:1025 +#: rpm.c:869 rpmqv.c:1035 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpm.c:863 rpmqv.c:1029 +#: rpm.c:873 rpmqv.c:1039 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpm.c:867 rpmqv.c:1033 +#: rpm.c:877 rpmqv.c:1043 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpm.c:871 rpmqv.c:1037 +#: rpm.c:881 rpmqv.c:1047 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpm.c:875 rpmqv.c:1041 +#: rpm.c:885 rpmqv.c:1051 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpm.c:879 rpmqv.c:1045 +#: rpm.c:889 rpmqv.c:1055 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpm.c:883 rpmqv.c:1049 +#: rpm.c:893 rpmqv.c:1059 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpm.c:887 rpmqv.c:1053 +#: rpm.c:897 rpmqv.c:1063 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpm.c:891 rpmqv.c:1057 +#: rpm.c:901 rpmqv.c:1067 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpm.c:896 rpmqv.c:1064 +#: rpm.c:906 rpmqv.c:1074 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:900 +#: rpm.c:910 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:904 rpmqv.c:1076 +#: rpm.c:914 rpmqv.c:1086 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpm.c:909 rpmqv.c:1081 +#: rpm.c:919 rpmqv.c:1091 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpm.c:913 rpmqv.c:1086 +#: rpm.c:923 rpmqv.c:1096 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpm.c:925 rpmqv.c:1098 +#: rpm.c:935 rpmqv.c:1108 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpm.c:931 rpmqv.c:1105 +#: rpm.c:941 rpmqv.c:1115 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: rpm.c:934 rpmqv.c:1110 +#: rpm.c:944 rpmqv.c:1120 msgid "--nopgp may only be used during signature checking" msgstr "" -#: rpm.c:937 rpmqv.c:1113 +#: rpm.c:947 rpmqv.c:1123 msgid "--nogpg may only be used during signature checking" msgstr "" -#: rpm.c:940 rpmqv.c:1118 +#: rpm.c:950 rpmqv.c:1128 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: rpm.c:951 rpmqv.c:1131 +#: rpm.c:961 rpmqv.c:1141 msgid "no files to sign\n" msgstr "" -#: rpm.c:956 rpmqv.c:1136 +#: rpm.c:966 rpmqv.c:1146 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpm.c:971 rpmqv.c:1152 +#: rpm.c:981 rpmqv.c:1162 msgid "pgp not found: " msgstr "" -#: rpm.c:975 rpmqv.c:1156 +#: rpm.c:985 rpmqv.c:1166 msgid "Enter pass phrase: " msgstr "" -#: rpm.c:977 rpmqv.c:1158 +#: rpm.c:987 rpmqv.c:1168 msgid "Pass phrase check failed\n" msgstr "" -#: rpm.c:980 rpmqv.c:1161 +#: rpm.c:990 rpmqv.c:1171 msgid "Pass phrase is good.\n" msgstr "" -#: rpm.c:985 rpmqv.c:1166 +#: rpm.c:995 rpmqv.c:1176 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpm.c:991 rpmqv.c:1172 +#: rpm.c:1001 rpmqv.c:1182 msgid "--sign may only be used during package building" msgstr "" -#: rpm.c:1006 rpmqv.c:1188 +#: rpm.c:1016 rpmqv.c:1198 msgid "exec failed\n" msgstr "" -#: rpm.c:1025 rpmqv.c:1457 +#: rpm.c:1035 rpmqv.c:1468 msgid "unexpected arguments to --querytags " msgstr "" -#: rpm.c:1036 rpmqv.c:1479 +#: rpm.c:1046 rpmqv.c:1490 msgid "no packages given for signature check" msgstr "" -#: rpm.c:1047 rpmqv.c:1490 +#: rpm.c:1057 rpmqv.c:1501 msgid "no packages given for signing" msgstr "" -#: rpm.c:1063 rpmqv.c:1330 +#: rpm.c:1073 rpmqv.c:1340 msgid "no packages given for uninstall" msgstr "" -#: rpm.c:1113 rpmqv.c:1380 +#: rpm.c:1124 rpmqv.c:1391 msgid "no packages given for install" msgstr "" -#: rpm.c:1136 rpmqv.c:1420 +#: rpm.c:1147 rpmqv.c:1431 msgid "extra arguments given for query of all packages" msgstr "" -#: rpm.c:1141 rpmqv.c:1425 +#: rpm.c:1152 rpmqv.c:1436 msgid "no arguments given for query" msgstr "" -#: rpm.c:1158 rpmqv.c:1445 +#: rpm.c:1169 rpmqv.c:1456 msgid "extra arguments given for verify of all packages" msgstr "" -#: rpm.c:1162 rpmqv.c:1449 +#: rpm.c:1173 rpmqv.c:1460 msgid "no arguments given for verify" msgstr "" @@ -1160,331 +1161,331 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:283 +#: rpmqv.c:284 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:287 +#: rpmqv.c:288 #, c-format msgid " %s {--initdb} [--dbpath ]\n" msgstr "" -#: rpmqv.c:288 +#: rpmqv.c:289 #, c-format msgid " %s {--rebuilddb} [--rcfile ] [--dbpath ]\n" msgstr "" -#: rpmqv.c:292 +#: rpmqv.c:293 #, c-format msgid "" " %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n" msgstr "" -#: rpmqv.c:312 +#: rpmqv.c:313 #, c-format msgid " %s {--erase -e} [--root ] [--noscripts] [--rcfile ]\n" msgstr "" -#: rpmqv.c:325 +#: rpmqv.c:326 #, c-format msgid " %s {--verify -V -y} [-afpg] [--root ] [--rcfile ]\n" msgstr "" -#: rpmqv.c:329 +#: rpmqv.c:330 #, c-format msgid " %s {--setperms} [-afpg] [target]\n" msgstr "" -#: rpmqv.c:330 +#: rpmqv.c:331 #, c-format msgid " %s {--setugids} [-afpg] [target]\n" msgstr "" -#: rpmqv.c:334 +#: rpmqv.c:335 #, c-format msgid "" " %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile " "]\n" msgstr "" -#: rpmqv.c:338 +#: rpmqv.c:339 #, c-format msgid " %s {--rmsource} [--rcfile ] [-v] specfile\n" msgstr "" -#: rpmqv.c:339 +#: rpmqv.c:340 #, c-format msgid "" " %s {--rebuild} [--rcfile ] [-v] source1.rpm ... sourceN.rpm\n" msgstr "" -#: rpmqv.c:340 +#: rpmqv.c:341 #, c-format msgid "" " %s {--recompile} [--rcfile ] [-v] source1.rpm ... sourceN.rpm\n" msgstr "" -#: rpmqv.c:341 +#: rpmqv.c:342 #, c-format msgid " %s {--freshen -F} file1.rpm ... fileN.rpm\n" msgstr "" -#: rpmqv.c:345 +#: rpmqv.c:346 #, c-format msgid " %s {--resign} [--rcfile ] package1 package2 ... packageN\n" msgstr "" -#: rpmqv.c:346 +#: rpmqv.c:347 #, c-format msgid " %s {--addsign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpmqv.c:347 +#: rpmqv.c:348 #, c-format msgid "" " %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile ]\n" msgstr "" -#: rpmqv.c:391 +#: rpmqv.c:392 msgid " All modes support the following options:" msgstr "" -#: rpmqv.c:392 +#: rpmqv.c:393 msgid " --define ' '" msgstr "" -#: rpmqv.c:394 +#: rpmqv.c:395 msgid " --eval '+' " msgstr "" -#: rpmqv.c:396 +#: rpmqv.c:397 msgid " --pipe " msgstr "" -#: rpmqv.c:398 +#: rpmqv.c:399 msgid " --rcfile " msgstr "" -#: rpmqv.c:403 +#: rpmqv.c:404 msgid " --dbpath " msgstr "" -#: rpmqv.c:405 +#: rpmqv.c:406 msgid " --root " msgstr "" -#: rpmqv.c:415 +#: rpmqv.c:416 msgid "" " Install, upgrade and query (with -p) modes allow URL's to be used in place" msgstr "" -#: rpmqv.c:416 +#: rpmqv.c:417 msgid " of file names as well as the following options:" msgstr "" -#: rpmqv.c:417 +#: rpmqv.c:418 msgid " --ftpproxy " msgstr "" -#: rpmqv.c:419 +#: rpmqv.c:420 msgid " --ftpport " msgstr "" -#: rpmqv.c:421 +#: rpmqv.c:422 msgid " --httpproxy " msgstr "" -#: rpmqv.c:423 +#: rpmqv.c:424 msgid " --httpport " msgstr "" -#: rpmqv.c:429 +#: rpmqv.c:430 msgid " Package specification options:" msgstr "" -#: lib/poptQV.c:62 rpmqv.c:431 +#: lib/poptQV.c:62 rpmqv.c:432 msgid "query/verify all packages" msgstr "" -#: rpmqv.c:432 +#: rpmqv.c:433 msgid " -f + " msgstr "" -#: rpmqv.c:433 +#: rpmqv.c:434 msgid "query/verify package owning " msgstr "" -#: rpmqv.c:434 +#: rpmqv.c:435 msgid " -p + " msgstr "" -#: rpmqv.c:435 +#: rpmqv.c:436 msgid "query/verify (uninstalled) package " msgstr "" -#: rpmqv.c:436 +#: rpmqv.c:437 msgid " --triggeredby " msgstr "" -#: rpmqv.c:437 +#: rpmqv.c:438 msgid "query/verify packages triggered by " msgstr "" -#: rpmqv.c:438 +#: rpmqv.c:439 msgid " --whatprovides " msgstr "" -#: rpmqv.c:439 +#: rpmqv.c:440 msgid "query/verify packages which provide capability" msgstr "" -#: rpmqv.c:440 +#: rpmqv.c:441 msgid " --whatrequires " msgstr "" -#: rpmqv.c:441 +#: rpmqv.c:442 msgid "query/verify packages which require capability" msgstr "" -#: rpmqv.c:445 +#: rpmqv.c:446 msgid " --queryformat " msgstr "" -#: rpmqv.c:448 +#: rpmqv.c:449 msgid " Information selection options:" msgstr "" -#: rpmqv.c:464 +#: rpmqv.c:465 msgid "list capabilities provided by package" msgstr "" -#: rpmqv.c:466 +#: rpmqv.c:467 msgid "list capabilities required by package" msgstr "" -#: rpmqv.c:468 +#: rpmqv.c:469 msgid "print the various [un]install scriptlets" msgstr "" -#: rpmqv.c:470 +#: rpmqv.c:471 msgid "show the trigger scriptlets contained in the package" msgstr "" -#: rpmqv.c:494 +#: rpmqv.c:495 msgid " --install " msgstr "" -#: rpmqv.c:495 +#: rpmqv.c:496 msgid " -i " msgstr "" -#: rpmqv.c:504 +#: rpmqv.c:505 msgid " --excludepath " msgstr "" -#: rpmqv.c:505 +#: rpmqv.c:506 msgid "skip files with leading component " msgstr "" -#: rpmqv.c:525 +#: rpmqv.c:526 msgid "don't execute any installation scriptlets" msgstr "" -#: rpmqv.c:527 +#: rpmqv.c:528 msgid "don't execute any scriptlets triggered by this package" msgstr "" -#: rpmqv.c:530 +#: rpmqv.c:531 msgid " --prefix " msgstr "" -#: rpmqv.c:532 +#: rpmqv.c:533 msgid " --relocate =" msgstr "" -#: rpmqv.c:541 +#: rpmqv.c:542 msgid " --upgrade " msgstr "" -#: rpmqv.c:542 +#: rpmqv.c:543 msgid " -U " msgstr "" -#: rpmqv.c:547 +#: rpmqv.c:548 msgid " --erase " msgstr "" -#: rpmqv.c:566 +#: rpmqv.c:567 msgid " -b " msgstr "" -#: rpmqv.c:567 +#: rpmqv.c:568 msgid " -t " msgstr "" -#: rpmqv.c:582 +#: rpmqv.c:583 msgid "package src rpm only" msgstr "" -#: rpmqv.c:593 +#: rpmqv.c:594 msgid " --buildroot " msgstr "" -#: rpmqv.c:595 +#: rpmqv.c:596 msgid " --target=+ " msgstr "" -#: rpmqv.c:600 +#: rpmqv.c:601 msgid " --rebuild " msgstr "" -#: rpmqv.c:602 +#: rpmqv.c:603 msgid " --recompile " msgstr "" -#: rpmqv.c:608 +#: rpmqv.c:609 msgid " --resign + " msgstr "" -#: rpmqv.c:610 +#: rpmqv.c:611 msgid " --addsign + " msgstr "" -#: rpmqv.c:613 +#: rpmqv.c:614 msgid " --checksig +" msgstr "" -#: rpmqv.c:614 +#: rpmqv.c:615 msgid " -K + " msgstr "" -#: rpmqv.c:627 +#: rpmqv.c:628 msgid "initalize database (unnecessary, legacy use)" msgstr "" -#: rpmqv.c:629 +#: rpmqv.c:630 msgid "rebuild database indices from existing database headers" msgstr "" -#: rpmqv.c:973 +#: rpmqv.c:983 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1080 msgid "" "--notriggers may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:1228 +#: rpmqv.c:1238 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1298 +#: rpmqv.c:1308 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1300 +#: rpmqv.c:1310 msgid "no tar files given for build" msgstr "" @@ -3050,7 +3051,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:683 lib/rpminstall.c:438 +#: lib/query.c:683 lib/rpminstall.c:448 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -3377,12 +3378,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:220 lib/rpminstall.c:363 +#: lib/rpminstall.c:220 lib/rpminstall.c:373 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:238 lib/rpminstall.c:503 +#: lib/rpminstall.c:238 lib/rpminstall.c:513 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -3392,44 +3393,44 @@ msgstr "" msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:292 +#: lib/rpminstall.c:302 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:297 +#: lib/rpminstall.c:307 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:314 +#: lib/rpminstall.c:324 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:325 +#: lib/rpminstall.c:335 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:343 +#: lib/rpminstall.c:353 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:441 +#: lib/rpminstall.c:451 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:464 +#: lib/rpminstall.c:474 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:492 +#: lib/rpminstall.c:502 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:498 +#: lib/rpminstall.c:508 #, c-format msgid "Installing %s\n" msgstr "" diff --git a/rpm.c b/rpm.c index b1eee4b..39b7722 100755 --- a/rpm.c +++ b/rpm.c @@ -110,6 +110,7 @@ static struct poptOption optionsTable[] = { { "excludedocs", '\0', 0, &excldocs, 0, NULL, NULL}, { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH, NULL, NULL}, { "force", '\0', 0, &force, 0, NULL, NULL}, +{ "freshen", 'F', 0, 0, 'F', NULL, NULL}, { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1, NULL, NULL}, { "hash", 'h', 0, &showHash, 0, NULL, NULL}, { "help", '\0', 0, &help, 0, NULL, NULL}, @@ -555,6 +556,7 @@ int main(int argc, const char ** argv) int numRelocations = 0; int sigTag; int upgrade = 0; + int freshen = 0; int probFilter = 0; #if HAVE_MCHECK_H && HAVE_MTRACE @@ -713,6 +715,14 @@ int main(int argc, const char ** argv) upgrade = 1; break; + case 'F': + if (bigMode != MODE_UNKNOWN && bigMode != MODE_INSTALL) + argerror(_("only one major mode may be specified")); + bigMode = MODE_INSTALL; + upgrade = 1; /* Freshen implies upgrade */ + freshen = 1; + break; + case GETOPT_RESIGN: if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN) argerror(_("only one major mode may be specified")); @@ -1108,6 +1118,7 @@ int main(int argc, const char ** argv) if (noDeps) interfaceFlags |= INSTALL_NODEPS; if (noOrder) interfaceFlags |= INSTALL_NOORDER; if (upgrade) interfaceFlags |= INSTALL_UPGRADE; + if (freshen) interfaceFlags |= INSTALL_FRESHEN; if (!poptPeekArg(optCon)) argerror(_("no packages given for install")); diff --git a/rpm.spec b/rpm.spec index 09a3d04..e815b6a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -255,6 +255,9 @@ fi %{__prefix}/include/popt.h %changelog +* Thu Jun 22 2000 Jeff Johnson +- internalize --freshen (Gordon Messmer ). + * Wed Jun 21 2000 Jeff Johnson - fix: don't expand macros in false branch of %if (kasal@suse.cz). - fix: macro expansion problem and clean up (#11484) (kasal@suse.cz). diff --git a/rpmpopt.in b/rpmpopt.in index f36ed4b..b456f22 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -67,8 +67,6 @@ rpm alias --last --qf ''%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VE --pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-35s %-s\n\", $1, substr($0,length($1)+2))}' " rpm alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' -rpm exec --freshen freshen.sh -rpm alias -F --freshen rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires diff --git a/rpmqv.c b/rpmqv.c index ded706d..45daacd 100755 --- a/rpmqv.c +++ b/rpmqv.c @@ -210,6 +210,7 @@ static struct poptOption optionsTable[] = { { "erase", 'e', 0, 0, 'e', NULL, NULL}, { "excludedocs", '\0', 0, &excldocs, 0, NULL, NULL}, { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH, NULL, NULL}, + { "freshen", 'F', 0, 0, 'F', NULL, NULL}, { "hash", 'h', 0, &showHash, 0, NULL, NULL}, { "ignorearch", '\0', 0, &ignoreArch, 0, NULL, NULL}, { "ignoreos", '\0', 0, &ignoreOs, 0, NULL, NULL}, @@ -649,6 +650,7 @@ int main(int argc, const char ** argv) int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0; int probFilter = 0; int upgrade = 0; + int freshen = 0; #endif #if defined(IAM_RPMK) @@ -828,6 +830,14 @@ int main(int argc, const char ** argv) upgrade = 1; break; + case 'F': + if (bigMode != MODE_UNKNOWN && bigMode != MODE_INSTALL) + argerror(_("only one major mode may be specified")); + bigMode = MODE_INSTALL; + upgrade = 1; /* Freshen implies upgrade */ + freshen = 1; + break; + case GETOPT_EXCLUDEPATH: if (*optArg != '/') argerror(_("exclude paths must begin with a /")); @@ -1375,6 +1385,7 @@ int main(int argc, const char ** argv) if (noDeps) interfaceFlags |= INSTALL_NODEPS; if (noOrder) interfaceFlags |= INSTALL_NOORDER; if (upgrade) interfaceFlags |= INSTALL_UPGRADE; + if (freshen) interfaceFlags |= INSTALL_FRESHEN; if (!poptPeekArg(optCon)) argerror(_("no packages given for install")); diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 163a2ba..8cdc6c9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = \ brp-compress brp-redhat brp-strip brp-strip-comment-note \ brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh \ find-prov.pl find-req.pl cpanflute find-provides.perl \ - find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \ + find-requires.perl get_magic.pl getpo.sh http.req \ magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh @@ -19,6 +19,6 @@ config_SCRIPTS = \ brp-compress brp-redhat brp-strip brp-strip-comment-note \ brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh \ find-prov.pl find-req.pl cpanflute find-provides.perl \ - find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \ + find-requires.perl get_magic.pl getpo.sh http.req \ magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 0787ca2..38ffbde 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -164,13 +164,13 @@ varprefix = @varprefix@ AUTOMAKE_OPTIONS = 1.4 foreign -EXTRA_DIST = brp-compress brp-redhat brp-strip brp-strip-comment-note brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl cpanflute find-provides.perl find-requires.perl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh vpkg-provides.sh vpkg-provides2.sh +EXTRA_DIST = brp-compress brp-redhat brp-strip brp-strip-comment-note brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl cpanflute find-provides.perl find-requires.perl get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh vpkg-provides.sh vpkg-provides2.sh installprefix = $(DESTDIR) configdir = ${prefix}/lib/rpm -config_SCRIPTS = brp-compress brp-redhat brp-strip brp-strip-comment-note brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl cpanflute find-provides.perl find-requires.perl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh vpkg-provides.sh vpkg-provides2.sh +config_SCRIPTS = brp-compress brp-redhat brp-strip brp-strip-comment-note brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl cpanflute find-provides.perl find-requires.perl get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh vpkg-provides.sh vpkg-provides2.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/scripts/freshen.sh b/scripts/freshen.sh deleted file mode 100755 index ef473ed..0000000 --- a/scripts/freshen.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# Implements --freshen option in RPM. --freshen is mostly like upgrade, but -# go through each file and make sure the package is actually installed before -# upgrading it. This won't work properly if there are any odd options -# specified (i.e. filenames with " specified). I'm sure some shell-hacker -# out there can fix that . - -case `basename $0` in -rpme|rpmi|rpmu) rpm="$0" ;; -*) rpm="`dirname $0`/rpmi" ;; -esac -shift - -args="-U" -while [ $# -gt 0 ]; do - if [ "$1" = "--" ]; then - break - fi - args="$args $1" - shift -done - -if [ $# = 0 ]; then - exec $RPM $args -fi - -origargs="$args" -args="$args -- " -shift - -# Just filenames left now -for n in $*; do - # if the file doesn't exist, we'll let RPM give the error message - if [ ! -f $n ]; then - args="$args $n" - else - if rpm -q `rpm -qp $n` >/dev/null 2>&1 - then - : - else - name=`rpm --qf "%{NAME}" -qp $n` - $RPM -q $name >/dev/null 2>&1 && args="$args $n" - fi - fi -done - -if [ "$args" = "$origargs -- " ]; then - echo no packages require freshening -else - exec $RPM $args -fi -- 2.7.4