From 3ea74aa3c7203c10ad97326778e22b1e654eefc7 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 14 Jul 2002 21:23:29 +0000 Subject: [PATCH] - python: sanity check fixes on rpmts/rpmte methods. CVS patchset: 5554 CVS date: 2002/07/14 21:23:29 --- .lclintrc | 2 +- CHANGES | 1 + beecrypt/.lclintrc | 1 + build/.lclintrc | 1 + lib/.lclintrc | 1 + lib/depends.c | 16 ++---- lib/rpminstall.c | 10 ++++ lib/verify.c | 2 +- po/cs.po | 22 ++++----- po/da.po | 22 ++++----- po/de.po | 22 ++++----- po/en_RN.po | 22 ++++----- po/es.po | 22 ++++----- po/eu_ES.po | 22 ++++----- po/fi.po | 22 ++++----- po/fr.po | 22 ++++----- po/gl.po | 22 ++++----- po/hu.po | 22 ++++----- po/id.po | 22 ++++----- po/is.po | 22 ++++----- po/it.po | 22 ++++----- po/ja.po | 22 ++++----- po/ko.po | 22 ++++----- po/no.po | 22 ++++----- po/pl.po | 22 ++++----- po/pt.po | 22 ++++----- po/pt_BR.po | 22 ++++----- po/ro.po | 22 ++++----- po/rpm.pot | 22 ++++----- po/ru.po | 22 ++++----- po/sk.po | 22 ++++----- po/sl.po | 24 ++++----- po/sr.po | 22 ++++----- po/sv.po | 24 ++++----- po/tr.po | 22 ++++----- po/uk.po | 22 ++++----- po/wa.po | 22 ++++----- po/zh.po | 22 ++++----- po/zh_CN.GB2312.po | 22 ++++----- popt/.lclintrc | 1 + popt/po/cs.po | 2 +- popt/po/da.po | 2 +- popt/po/de.po | 2 +- popt/po/es.po | 2 +- popt/po/eu_ES.po | 2 +- popt/po/fi.po | 2 +- popt/po/fr.po | 2 +- popt/po/gl.po | 2 +- popt/po/hu.po | 2 +- popt/po/id.po | 2 +- popt/po/is.po | 2 +- popt/po/it.po | 2 +- popt/po/ja.po | 2 +- popt/po/ko.po | 2 +- popt/po/no.po | 2 +- popt/po/pl.po | 2 +- popt/po/popt.pot | 2 +- popt/po/pt.po | 2 +- popt/po/pt_BR.po | 2 +- popt/po/ro.po | 2 +- popt/po/ru.po | 2 +- popt/po/sk.po | 2 +- popt/po/sl.po | 2 +- popt/po/sr.po | 2 +- popt/po/sv.po | 2 +- popt/po/tr.po | 2 +- popt/po/uk.po | 2 +- popt/po/wa.po | 2 +- popt/po/zh.po | 2 +- popt/po/zh_CN.GB2312.po | 2 +- python/.lclintrc | 127 +++++++++++++++++++++++++++++++++++++----------- python/Makefile.am | 10 +++- python/hash.c | 7 ++- python/header-py.c | 28 ++++++++++- python/header-py.h | 47 ++++++++++++------ python/rpmal-py.c | 26 +++++++++- python/rpmal-py.h | 4 +- python/rpmdb-py.c | 26 +++++++++- python/rpmdb-py.h | 13 +++-- python/rpmds-py.c | 43 ++++++++++++++-- python/rpmds-py.h | 16 ++++-- python/rpmfd-py.c | 23 ++++++++- python/rpmfd-py.h | 4 +- python/rpmfi-py.c | 55 ++++++++++++++++++--- python/rpmfi-py.h | 10 ++-- python/rpmmi-py.c | 20 +++++++- python/rpmmi-py.h | 7 ++- python/rpmmodule.c | 5 ++ python/rpmrc-py.c | 50 +++++++++++++++++-- python/rpmrc-py.h | 12 +++-- python/rpmte-py.c | 94 ++++++++++++++++++++++++++++++----- python/rpmte-py.h | 4 +- python/rpmts-py.c | 99 +++++++++++++++++++++++++++++++++++-- python/rpmts-py.h | 4 +- python/upgrade.c | 18 +++---- rpm.spec.in | 3 ++ rpmdb/.lclintrc | 1 + rpmio/.lclintrc | 1 + 98 files changed, 1033 insertions(+), 505 deletions(-) diff --git a/.lclintrc b/.lclintrc index 85f7f3f..202b09a 100644 --- a/.lclintrc +++ b/.lclintrc @@ -14,9 +14,9 @@ # --- in progress +bounds -#+boundswrite +slovak-fcns -redecl +-bufferoverflowhigh -macroparams -declundef diff --git a/CHANGES b/CHANGES index 9adf95f..250163b 100644 --- a/CHANGES +++ b/CHANGES @@ -170,6 +170,7 @@ - revert headerFree/headerLink/headerUnlink debugging. - popt: mingw32 portability configure check (#67911). - teach gendiff about unreadable files (#42666). + - python: sanity check fixes on rpmts/rpmte methods. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/beecrypt/.lclintrc b/beecrypt/.lclintrc index 652a599..0bdce83 100644 --- a/beecrypt/.lclintrc +++ b/beecrypt/.lclintrc @@ -14,6 +14,7 @@ # --- in progress +bounds +-bufferoverflowhigh # --- not-yet at strict level -exportconst # 4 diff --git a/build/.lclintrc b/build/.lclintrc index 8b1d44a..94897f6 100644 --- a/build/.lclintrc +++ b/build/.lclintrc @@ -14,6 +14,7 @@ # --- in progress +bounds +-bufferoverflowhigh # --- +partial artifacts -declundef diff --git a/lib/.lclintrc b/lib/.lclintrc index b591159..169628e 100644 --- a/lib/.lclintrc +++ b/lib/.lclintrc @@ -16,6 +16,7 @@ +bounds +slovak-fcns -redecl +-bufferoverflowhigh # --- +partial artifacts -declundef diff --git a/lib/depends.c b/lib/depends.c index 1c95d6a..813cf71 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -243,7 +243,7 @@ int rpmtsAddInstallElement(rpmts ts, Header h, goto exit; /* Do lazy (readonly?) open of rpm database. */ - if (rpmtsGetRdb(ts) == NULL) { + if (rpmtsGetRdb(ts) == NULL && ts->dbmode != -1) { if ((ec = rpmtsOpenDB(ts, ts->dbmode)) != 0) goto exit; } @@ -1557,17 +1557,7 @@ assert(newOrderCount == ts->orderCount); ts->orderAlloced = ts->orderCount; orderList = _free(orderList); -#ifdef DYING - /* Clean up after dependency checks */ - pi = rpmtsiInit(ts); - while ((p = rpmtsiNext(pi, 0)) != NULL) { - rpmteCleanDS(p); - } - pi = rpmtsiFree(pi); - - ts->addedPackages = rpmalFree(ts->addedPackages); - ts->numAddedPackages = 0; -#else +#ifdef DYING /* XXX now done at the CLI level just before rpmtsRun(). */ rpmtsClean(ts); #endif freeBadDeps(); @@ -1585,7 +1575,7 @@ int rpmtsCheck(rpmts ts) int rc; /* Do lazy, readonly, open of rpm database. */ - if (rpmtsGetRdb(ts) == NULL) { + if (rpmtsGetRdb(ts) == NULL && ts->dbmode != -1) { if ((rc = rpmtsOpenDB(ts, ts->dbmode)) != 0) goto exit; closeatexit = 1; diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 5169156..bbf5c78 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -570,6 +570,9 @@ restart: rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); + /* Drop added/available package indices and dependency sets. */ + rpmtsClean(ts); + rc = rpmtsRun(ts, NULL, probFilter); ps = rpmtsProblems(ts); @@ -694,6 +697,10 @@ int rpmErase(rpmts ts, if (!stopUninstall) { (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | RPMTRANS_FLAG_REVERSE)); + + /* Drop added/available package indices and dependency sets. */ + rpmtsClean(ts); + numPackages = rpmtsRun(ts, NULL, 0); ps = rpmtsProblems(ts); if (rpmpsNumProblems(ps) > 0) @@ -1069,6 +1076,9 @@ int rpmRollback(rpmts ts, if (rc != 0) goto exit; + /* Drop added/available package indices and dependency sets. */ + rpmtsClean(ts); + rc = rpmtsRun(ts, NULL, (ia->probFilter|RPMPROB_FILTER_OLDPACKAGE)); ps = rpmtsProblems(ts); if (rc > 0 && rpmpsNumProblems(ps) > 0) diff --git a/lib/verify.c b/lib/verify.c index b8edc74..ea2721a 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -386,7 +386,7 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmts ts, /*@-boundswrite@*/ *te = '\0'; pkgNEVR = (ps->probs->pkgNEVR ? ps->probs->pkgNEVR : "?pkgNEVR?"); - sprintf(te, _("Unsatisifed dependencies for %s: "), pkgNEVR); + sprintf(te, _("Unsatisfied dependencies for %s: "), pkgNEVR); te += strlen(te); for (i = 0; i < numProblems; i++) { p = ps->probs + i; diff --git a/po/cs.po b/po/cs.po index 9127bf2..b91c529 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2223,7 +2223,7 @@ msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2306,7 +2306,7 @@ msgstr "z msgid "record %u could not be read\n" msgstr "záznam %u nelze pøeèíst\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2515,7 +2515,7 @@ msgstr "chyba p msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " @@ -2525,7 +2525,7 @@ msgstr "neinstalov msgid "found %d source and %d binary packages\n" msgstr "vytvoøení zdrojového a binárního balíèku z " -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2540,27 +2540,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "nainstalovat balíèek" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, fuzzy, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "Polo¾ka %s musí být v balíèku pøítomna: %s\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2948,7 +2948,7 @@ msgstr "chyb #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "chybné závislosti pøi sestavování:\n" #: rpmdb/db3.c:156 diff --git a/po/da.po b/po/da.po index 21439a8..43a48fc 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -2239,7 +2239,7 @@ msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2322,7 +2322,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2529,7 +2529,7 @@ msgstr "fejl ved l msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2539,7 +2539,7 @@ msgstr "%s kunne ikke installeres\n" msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2553,27 +2553,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2957,7 +2957,7 @@ msgstr "manglende %s" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/de.po b/po/de.po index 5ec8fcf..9f652d7 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2402,7 +2402,7 @@ msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2489,7 +2489,7 @@ msgstr "ung msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2700,7 +2700,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2710,7 +2710,7 @@ msgstr "Fehler: %s kann nicht installiert werden\n" msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2725,27 +2725,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" @@ -3140,7 +3140,7 @@ msgstr "fehlende { nach %{" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/en_RN.po b/po/en_RN.po index 4ed2edd..328c9ba 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/es.po b/po/es.po index 4ed2edd..328c9ba 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/eu_ES.po b/po/eu_ES.po index 4ed2edd..328c9ba 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/fi.po b/po/fi.po index deb84ef..ab5f9f6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2283,7 +2283,7 @@ msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2367,7 +2367,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2573,7 +2573,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2583,7 +2583,7 @@ msgstr "virhe: %s ei voida asentaa\n" msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2598,27 +2598,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "poistolle ei määritelty paketteja" @@ -3006,7 +3006,7 @@ msgstr "puuttuva '{' '%':n j #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" #: rpmdb/db3.c:156 diff --git a/po/fr.po b/po/fr.po index cf016a3..c255246 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2328,7 +2328,7 @@ msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2412,7 +2412,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2617,7 +2617,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2627,7 +2627,7 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2641,27 +2641,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "aucun package n'a t spcifi pour la dsinstallation" @@ -3045,7 +3045,7 @@ msgstr "" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" #: rpmdb/db3.c:156 diff --git a/po/gl.po b/po/gl.po index f9e387d..6b837a8 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2157,7 +2157,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2240,7 +2240,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2442,7 +2442,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2452,7 +2452,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2465,27 +2465,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2861,7 +2861,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/hu.po b/po/hu.po index 4ed2edd..328c9ba 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/id.po b/po/id.po index 4ed2edd..328c9ba 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/is.po b/po/is.po index 5404efb..ac88e1f 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2178,7 +2178,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2261,7 +2261,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2463,7 +2463,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2473,7 +2473,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2487,27 +2487,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2884,7 +2884,7 @@ msgstr "vantar %s" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/it.po b/po/it.po index 4ed2edd..328c9ba 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/ja.po b/po/ja.po index 6c9c592..33e8289 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -2320,7 +2320,7 @@ msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2404,7 +2404,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2613,7 +2613,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n" @@ -2623,7 +2623,7 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2637,27 +2637,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "%s #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" #: rpmdb/db3.c:156 diff --git a/po/ko.po b/po/ko.po index 9e047e0..7ea327e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -2212,7 +2212,7 @@ msgid "can't query %s: %s\n" msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2296,7 +2296,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u(Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2502,7 +2502,7 @@ msgstr "%s msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" @@ -2512,7 +2512,7 @@ msgstr "%s( msgid "found %d source and %d binary packages\n" msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2526,27 +2526,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "(+%d,-%d) ÆÐÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù" @@ -2933,7 +2933,7 @@ msgstr " #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " #: rpmdb/db3.c:156 diff --git a/po/no.po b/po/no.po index a324782..e7a8424 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2203,7 +2203,7 @@ msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2286,7 +2286,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2488,7 +2488,7 @@ msgstr "feil under lesing fra fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2498,7 +2498,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2512,27 +2512,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2912,7 +2912,7 @@ msgstr "mangler %s" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "feilede avhengigheter:\n" #: rpmdb/db3.c:156 diff --git a/po/pl.po b/po/pl.po index ac21338..c7e20b0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2283,7 +2283,7 @@ msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê: %s\n" @@ -2367,7 +2367,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2573,7 +2573,7 @@ msgstr "b msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -2583,7 +2583,7 @@ msgstr "%s nie mo msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2597,27 +2597,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -3006,7 +3006,7 @@ msgstr "brak %s\n" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/pt.po b/po/pt.po index b968bec..62b2d36 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" @@ -2157,7 +2157,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2240,7 +2240,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2442,7 +2442,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2452,7 +2452,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2465,27 +2465,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2861,7 +2861,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/rpm.pot b/po/rpm.pot index 099fdab..1c9d6c8 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2163,7 +2163,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2246,7 +2246,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2448,7 +2448,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2458,7 +2458,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2471,27 +2471,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2867,7 +2867,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/ru.po b/po/ru.po index ca69f4e..e805e85 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -2226,7 +2226,7 @@ msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2309,7 +2309,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2515,7 +2515,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2525,7 +2525,7 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2539,27 +2539,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ÐÁËÅÔÙ Ë %s" @@ -2942,7 +2942,7 @@ msgstr " #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/sk.po b/po/sk.po index 83caaeb..167ae03 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2281,7 +2281,7 @@ msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2365,7 +2365,7 @@ msgstr "po msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2571,7 +2571,7 @@ msgstr "chyba pri vytv msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -2581,7 +2581,7 @@ msgstr "%s nie je mo msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2595,27 +2595,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -3002,7 +3002,7 @@ msgstr "ch #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/sl.po b/po/sl.po index 109e9c2..702a783 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.279 2002/07/13 19:09:37 jbj Exp $ +# $Id: sl.po,v 1.280 2002/07/14 21:24:03 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2281,7 +2281,7 @@ msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2365,7 +2365,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2573,7 +2573,7 @@ msgstr "napaka pri branju iz datoteke %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" @@ -2583,7 +2583,7 @@ msgstr "%s ni mo msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2597,27 +2597,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -3005,7 +3005,7 @@ msgstr "manjka %s\n" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/sr.po b/po/sr.po index 5473e46..92608ef 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -2274,7 +2274,7 @@ msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2358,7 +2358,7 @@ msgstr "pogre msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2564,7 +2564,7 @@ msgstr "gre msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -2574,7 +2574,7 @@ msgstr "gre msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2589,27 +2589,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "neodstaje paket za deinstalaciju" @@ -2997,7 +2997,7 @@ msgstr "nedostaje { posle %" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " #: rpmdb/db3.c:156 diff --git a/po/sv.po b/po/sv.po index f2f632a..3df8538 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2187,7 +2187,7 @@ msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2270,7 +2270,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2474,7 +2474,7 @@ msgstr "fel vid l msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2484,7 +2484,7 @@ msgstr "%s kan inte installeras\n" msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "Ouppfyllda beroenden:\n" @@ -2497,27 +2497,27 @@ msgstr " F msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "återställer %d paket till %s" @@ -2894,8 +2894,8 @@ msgid "missing %s" msgstr "saknas %s" #: lib/verify.c:389 -#, c-format -msgid "Unsatisifed dependencies for %s: " +#, fuzzy, c-format +msgid "Unsatisfied dependencies for %s: " msgstr "Ouppfyllda beroenden för %s: " #: rpmdb/db3.c:156 diff --git a/po/tr.po b/po/tr.po index 7954873..a49b707 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -2243,7 +2243,7 @@ msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2326,7 +2326,7 @@ msgstr "paket kay msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2532,7 +2532,7 @@ msgstr "%s dosyas msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2542,7 +2542,7 @@ msgstr "%s y msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" @@ -2556,27 +2556,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2957,7 +2957,7 @@ msgstr "eksik %s" #: lib/verify.c:389 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " #: rpmdb/db3.c:156 diff --git a/po/uk.po b/po/uk.po index 4ed2edd..328c9ba 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/wa.po b/po/wa.po index 4ed2edd..328c9ba 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/zh.po b/po/zh.po index 4ed2edd..328c9ba 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 4ed2edd..328c9ba 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-13 15:09-0400\n" +"POT-Creation-Date: 2002-07-14 17:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2162,7 +2162,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492 -#: lib/rpminstall.c:874 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:659 +#: lib/query.c:907 lib/rpminstall.c:662 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2447,7 +2447,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:484 lib/rpminstall.c:730 tools/rpmgraph.c:156 +#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2457,7 +2457,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:534 lib/rpminstall.c:687 lib/rpminstall.c:1061 +#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" @@ -2470,27 +2470,27 @@ msgstr "" msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:592 +#: lib/rpminstall.c:595 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:662 +#: lib/rpminstall.c:665 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:717 +#: lib/rpminstall.c:724 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:723 +#: lib/rpminstall.c:730 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1055 +#: lib/rpminstall.c:1062 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #: lib/verify.c:389 #, c-format -msgid "Unsatisifed dependencies for %s: " +msgid "Unsatisfied dependencies for %s: " msgstr "" #: rpmdb/db3.c:156 diff --git a/popt/.lclintrc b/popt/.lclintrc index 49aac97..e429478 100644 --- a/popt/.lclintrc +++ b/popt/.lclintrc @@ -14,6 +14,7 @@ # --- in progress +bounds +-bufferoverflowhigh # --- +partial artifacts -exportlocal # 14 diff --git a/popt/po/cs.po b/popt/po/cs.po index ce7da72..7d7e66d 100644 --- a/popt/po/cs.po +++ b/popt/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-07-24 00:03+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/popt/po/da.po b/popt/po/da.po index 8dc0755..9b159e2 100644 --- a/popt/po/da.po +++ b/popt/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n" "Last-Translator: Martin Hansen \n" "Language-Team: Dansk \n" diff --git a/popt/po/de.po b/popt/po/de.po index d86c78e..9cf7ac3 100644 --- a/popt/po/de.po +++ b/popt/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/es.po b/popt/po/es.po index 83a57df..7209a4e 100644 --- a/popt/po/es.po +++ b/popt/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Leandro Lucarella \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po index d86c78e..9cf7ac3 100644 --- a/popt/po/eu_ES.po +++ b/popt/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fi.po b/popt/po/fi.po index d86c78e..9cf7ac3 100644 --- a/popt/po/fi.po +++ b/popt/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fr.po b/popt/po/fr.po index d86c78e..9cf7ac3 100644 --- a/popt/po/fr.po +++ b/popt/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/gl.po b/popt/po/gl.po index 5046517..820d8e8 100644 --- a/popt/po/gl.po +++ b/popt/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-01-17 01:01+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/popt/po/hu.po b/popt/po/hu.po index 6a86100..cac9622 100644 --- a/popt/po/hu.po +++ b/popt/po/hu.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2000-08-03 23:26+0200\n" "Last-Translator: László Németh \n" "Language-Team: Hungarian\n" diff --git a/popt/po/id.po b/popt/po/id.po index d86c78e..9cf7ac3 100644 --- a/popt/po/id.po +++ b/popt/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/is.po b/popt/po/is.po index 625baa7..d10ed7c 100644 --- a/popt/po/is.po +++ b/popt/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-06-08 01:35+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/popt/po/it.po b/popt/po/it.po index d86c78e..9cf7ac3 100644 --- a/popt/po/it.po +++ b/popt/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ja.po b/popt/po/ja.po index d86c78e..9cf7ac3 100644 --- a/popt/po/ja.po +++ b/popt/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ko.po b/popt/po/ko.po index 4a7ee96..192bc6d 100644 --- a/popt/po/ko.po +++ b/popt/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-09-06 20:06+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/popt/po/no.po b/popt/po/no.po index 5a336c0..d89a819 100644 --- a/popt/po/no.po +++ b/popt/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-06-27 11:05+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/popt/po/pl.po b/popt/po/pl.po index d86c78e..9cf7ac3 100644 --- a/popt/po/pl.po +++ b/popt/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/popt.pot b/popt/po/popt.pot index 2ddcdad..6a0ccc9 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/pt.po b/popt/po/pt.po index 01b766f..91fff7e 100644 --- a/popt/po/pt.po +++ b/popt/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2002-02-13 18:32+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po index d86c78e..9cf7ac3 100644 --- a/popt/po/pt_BR.po +++ b/popt/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ro.po b/popt/po/ro.po index 60ca30f..14c4a31 100644 --- a/popt/po/ro.po +++ b/popt/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2000-06-14 23:23+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" diff --git a/popt/po/ru.po b/popt/po/ru.po index cb14cd5..05e236d 100644 --- a/popt/po/ru.po +++ b/popt/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-07-05 21:00-0500\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/popt/po/sk.po b/popt/po/sk.po index 7bdbd0d..7034950 100644 --- a/popt/po/sk.po +++ b/popt/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/popt/po/sl.po b/popt/po/sl.po index 887c5b5..e5613e0 100644 --- a/popt/po/sl.po +++ b/popt/po/sl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2000-09-05 12:30+0200\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" diff --git a/popt/po/sr.po b/popt/po/sr.po index d86c78e..9cf7ac3 100644 --- a/popt/po/sr.po +++ b/popt/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/sv.po b/popt/po/sv.po index f288d79..e0c91d6 100644 --- a/popt/po/sv.po +++ b/popt/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2001-07-12 22:26+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" diff --git a/popt/po/tr.po b/popt/po/tr.po index ca8f6a6..c51b46d 100644 --- a/popt/po/tr.po +++ b/popt/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 2000-02-11 13:01+0200\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/popt/po/uk.po b/popt/po/uk.po index 8fae535..ac541bf 100644 --- a/popt/po/uk.po +++ b/popt/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 1999-09-30 16:54+0200\n" "Last-Translator: Yuri Syrota \n" "Language-Team: Ukrainian \n" diff --git a/popt/po/wa.po b/popt/po/wa.po index 50483e6..bd7fdfd 100644 --- a/popt/po/wa.po +++ b/popt/po/wa.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon \n" diff --git a/popt/po/zh.po b/popt/po/zh.po index d86c78e..9cf7ac3 100644 --- a/popt/po/zh.po +++ b/popt/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po index f484099..94d5bc0 100644 --- a/popt/po/zh_CN.GB2312.po +++ b/popt/po/zh_CN.GB2312.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-07-09 11:35-0400\n" +"POT-Creation-Date: 2002-07-14 10:58-0400\n" "PO-Revision-Date: 1999-11-11 05:04+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" diff --git a/python/.lclintrc b/python/.lclintrc index cc7d9ac..70d9da5 100644 --- a/python/.lclintrc +++ b/python/.lclintrc @@ -1,36 +1,107 @@ --I. -I.. -I../lib -I../rpmdb -I../rpmio -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE +-I. -I.. -I../build -I../lib -I../rpmdb -I../rpmio -I../beecrypt -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE +partial ++forcehints -warnunixlib -warnposix +unixlib -# XXX ignore doxygen markings --unrecogcomments - -# don't-bother-me-yet parameters --branchstate # ~39 --mustfree # ~325 - -# not-yet normal parameters --boolops # ~351 w->n --predboolint # ~200 w->n --type # ~271 - -# -weak paramaters -#+boolint -#-boolops -#+ignorequals -#+ignoresigns -#-mustfree -#+longintegral -#+matchanyintegral -#-nullpass -#-observertrans -#-predboolint -#-predboolothers -#-retvalint -#-retvalother -#-shiftsigned +-unrecogcomments # XXX ignore doxygen markings + ++strict # lclint level + +# --- in progress +#+bounds ++slovak-fcns +-bufferoverflowhigh + +-branchstate +-castfcnptr +-compdef +-evalorderuncon +-exportheader +-globs +-globstate +-incondefs # 1 +-internalglobs +-modfilesys +-modnomods +-modobserveruncon +-moduncon +-modunconnomods +-noeffect +-noeffectuncon +-nullderef +-nullpass +-nullret +-nullstate +-predboolothers +-protoparammatch +-redecl +-redef +-retalias +-retvalint +-retvalother +-sizeoftype +-type +-usereleased + +-dependenttrans +-exposetrans +-immediatetrans +-kepttrans +-newreftrans +-observertrans +-onlytrans +-readonlytrans +-refcounttrans +-statictrans +-temptrans + +-ifempty + +# --- +partial artifacts +-declundef +-exportheadervar +-exportlocal + +-enummemuse +-fcnuse +-typeuse +-varuse + +# --- not-yet at strict level +-bitwisesigned # 160 +-elseifcomplete # 9 +-exportconst # 687 +-exportfcn # 464 +-exporttype # 196 +-exportvar # 55 +-fielduse # 225 occurence +-forblock # tedious +-ifblock # tedious +-namechecks # 1679 +-ptrarith # 201 + +-compdestroy # 125 +-mustdefine # 76 +-sys-dir-errors + +-strictops # 54 +-strictusereleased # 3 +-whileblock # 20 + +# --- not-yet at checks level ++enumint # 211 +-mustfree # 219 +-predboolptr # 107 +-usedef # 42 + +# --- not-yet at standard level +-boolops # 81 ++boolint # 18 ++charint # 74 ++ignorequals # 104 ++matchanyintegral # 90 diff --git a/python/Makefile.am b/python/Makefile.am index 4a1741f..ac12b90 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -61,6 +61,14 @@ _rpmdb.so$(EXEEXT): $(_rpmdb_so_OBJECTS) poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS) $(CC) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS) +# rpmmodule.c hash.c upgrade.c header-py.c \ +# rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ +# rpmrc-py.c rpmte-py.c rpmts-py.c +# rpmmodule.c header-py.c +splint_srcs = hash.c upgrade.c \ + rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ + rpmrc-py.c rpmte-py.c rpmts-py.c + .PHONY: lclint lclint: - lclint $(DEFS) $(INCLUDES) $(librpmmodule_la_SOURCES) + lclint $(DEFS) $(INCLUDES) $(splint_srcs) diff --git a/python/hash.c b/python/hash.c index 00d7348..f3b88c4 100644 --- a/python/hash.c +++ b/python/hash.c @@ -2,13 +2,12 @@ * \file python/hash.c */ -#include -#include -#include -#include +#include "system.h" #include "hash.h" +#include "debug.h" + #define CHUNK 1 struct filePath { diff --git a/python/header-py.c b/python/header-py.c index a875c53..b3d88e6 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -5,6 +5,11 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif + #include "rpmio_internal.h" #include "rpmcli.h" /* XXX for rpmCheckSig */ @@ -92,7 +97,9 @@ struct hdrObject_s { unsigned short * modes; } ; -/*@unused@*/ static inline Header headerAllocated(Header h) { +/*@unused@*/ static inline Header headerAllocated(Header h) + /*@modifies h @*/ +{ h->flags |= HEADERFLAG_ALLOCATED; return 0; } @@ -100,6 +107,7 @@ struct hdrObject_s { /** \ingroup python */ static PyObject * hdrKeyList(hdrObject * s, PyObject * args) + /*@*/ { PyObject * list, *o; HeaderIterator hi; @@ -132,7 +140,9 @@ static PyObject * hdrKeyList(hdrObject * s, PyObject * args) /** \ingroup python */ -static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords) { +static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords) + /*@*/ +{ char * buf; PyObject * rc; int len, legacy = 0; @@ -169,6 +179,7 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords) * It should be passed the file number to verify. */ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) + /*@*/ { int fileNumber; rpmVerifyAttrs verifyResult = 0; @@ -393,6 +404,7 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) /** \ingroup python */ static PyObject * hdrExpandFilelist(hdrObject * s, PyObject * args) + /*@*/ { expandFilelist (s->h); @@ -403,6 +415,7 @@ static PyObject * hdrExpandFilelist(hdrObject * s, PyObject * args) /** \ingroup python */ static PyObject * hdrCompressFilelist(hdrObject * s, PyObject * args) + /*@*/ { compressFilelist (s->h); @@ -414,6 +427,7 @@ static PyObject * hdrCompressFilelist(hdrObject * s, PyObject * args) /** \ingroup python */ static void mungeFilelist(Header h) + /*@*/ { const char ** fileNames = NULL; int count = 0; @@ -438,6 +452,7 @@ static void mungeFilelist(Header h) /** */ static PyObject * rhnUnload(hdrObject * s, PyObject * args) + /*@*/ { int len; char * uh; @@ -499,6 +514,7 @@ static PyObject * rhnUnload(hdrObject * s, PyObject * args) /** \ingroup python */ static PyObject * hdrFullFilelist(hdrObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, "")) return NULL; @@ -512,6 +528,7 @@ static PyObject * hdrFullFilelist(hdrObject * s, PyObject * args) /** \ingroup python */ static PyObject * hdrSprintf(hdrObject * s, PyObject * args) + /*@*/ { char * fmt; char * r; @@ -536,12 +553,14 @@ static PyObject * hdrSprintf(hdrObject * s, PyObject * args) /** */ static int hdr_compare(hdrObject * a, hdrObject * b) + /*@*/ { return rpmVersionCompare(a->h, b->h); } /** \ingroup python */ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef hdr_methods[] = { {"keys", (PyCFunction) hdrKeyList, METH_VARARGS, NULL }, @@ -573,6 +592,7 @@ static struct PyMethodDef hdr_methods[] = { /** \ingroup python */ static PyObject * hdr_getattr(hdrObject * s, char * name) + /*@*/ { return Py_FindMethod(hdr_methods, (PyObject * ) s, name); } @@ -580,6 +600,7 @@ static PyObject * hdr_getattr(hdrObject * s, char * name) /** \ingroup python */ static void hdr_dealloc(hdrObject * s) + /*@*/ { if (s->h) headerFree(s->h); s->md5list = _free(s->md5list); @@ -609,6 +630,7 @@ long tagNumFromPyObject (PyObject *item) /** \ingroup python */ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) + /*@*/ { int type, count, i, tag = -1; void * data; @@ -766,6 +788,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) /** \ingroup python */ +/*@unchecked@*/ /*@observer@*/ static PyMappingMethods hdr_as_mapping = { (inquiry) 0, /* mp_length */ (binaryfunc) hdr_subscript, /* mp_subscript */ @@ -779,6 +802,7 @@ static char hdr_doc[] = /** \ingroup python */ +/*@unchecked@*/ /*@observer@*/ PyTypeObject hdr_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ diff --git a/python/header-py.h b/python/header-py.h index 397e45f..d2c138f 100644 --- a/python/header-py.h +++ b/python/header-py.h @@ -8,27 +8,42 @@ /** \ingroup python */ typedef struct hdrObject_s hdrObject; + +/*@unchecked@*/ extern PyTypeObject hdr_Type; /** \ingroup python */ PyObject * pyrpmError; -hdrObject * hdr_Wrap(Header h); - -Header hdrGetHeader(hdrObject * h); - -long tagNumFromPyObject (PyObject *item); - -PyObject * labelCompare (PyObject * self, PyObject * args); -PyObject * versionCompare (PyObject * self, PyObject * args); -PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args); -int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag); -PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args); -PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args); -PyObject * rpmReadHeaders (FD_t fd); -PyObject * rhnLoad(PyObject * self, PyObject * args); -PyObject * hdrLoad(PyObject * self, PyObject * args); -PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args); +hdrObject * hdr_Wrap(Header h) + /*@*/; + +Header hdrGetHeader(hdrObject * h) + /*@*/; + +long tagNumFromPyObject (PyObject *item) + /*@*/; + +PyObject * labelCompare (PyObject * self, PyObject * args) + /*@*/; +PyObject * versionCompare (PyObject * self, PyObject * args) + /*@*/; +PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args) + /*@*/; +int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag) + /*@*/; +PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args) + /*@*/; +PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args) + /*@*/; +PyObject * rpmReadHeaders (FD_t fd) + /*@*/; +PyObject * rhnLoad(PyObject * self, PyObject * args) + /*@*/; +PyObject * hdrLoad(PyObject * self, PyObject * args) + /*@*/; +PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) + /*@*/; #endif diff --git a/python/rpmal-py.c b/python/rpmal-py.c index 9eb43bb..6910bb6 100644 --- a/python/rpmal-py.c +++ b/python/rpmal-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include @@ -15,7 +19,9 @@ #include "debug.h" static PyObject * -rpmal_Debug(rpmalObject * s, PyObject * args) +rpmal_Debug(/*@unused@*/ rpmalObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, "i", &_rpmal_debug)) return NULL; Py_INCREF(Py_None); @@ -24,6 +30,7 @@ rpmal_Debug(rpmalObject * s, PyObject * args) static PyObject * rpmal_Add(rpmalObject * s, PyObject * args) + /*@modifies s @*/ { rpmdsObject * dso; rpmfiObject * fio; @@ -41,6 +48,8 @@ rpmal_Add(rpmalObject * s, PyObject * args) static PyObject * rpmal_Del(rpmalObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { alKey pkgKey; @@ -55,6 +64,8 @@ rpmal_Del(rpmalObject * s, PyObject * args) static PyObject * rpmal_AddProvides(rpmalObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { rpmdsObject * dso; alKey pkgKey; @@ -70,6 +81,8 @@ rpmal_AddProvides(rpmalObject * s, PyObject * args) static PyObject * rpmal_MakeIndex(rpmalObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, ":MakeIndex")) return NULL; @@ -80,6 +93,8 @@ rpmal_MakeIndex(rpmalObject * s, PyObject * args) return Py_None; } +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmal_methods[] = { {"Debug", (PyCFunction)rpmal_Debug, METH_VARARGS, NULL}, @@ -91,13 +106,15 @@ static struct PyMethodDef rpmal_methods[] = { NULL}, {"makeIndex",(PyCFunction)rpmal_MakeIndex, METH_VARARGS, NULL}, - {NULL, NULL} /* sentinel */ + {NULL, NULL } /* sentinel */ }; +/*@=fullinitblock@*/ /* ---------- */ static void rpmal_dealloc(rpmalObject * s) + /*@modifies s @*/ { if (s) { s->al = rpmalFree(s->al); @@ -107,15 +124,19 @@ rpmal_dealloc(rpmalObject * s) static PyObject * rpmal_getattr(rpmalObject * s, char * name) + /*@*/ { return Py_FindMethod(rpmal_methods, (PyObject *)s, name); } /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmal_doc[] = ""; +/*@-fullinitblock@*/ +/*@unchecked@*/ PyTypeObject rpmal_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ @@ -162,6 +183,7 @@ PyTypeObject rpmal_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ /* ---------- */ diff --git a/python/rpmal-py.h b/python/rpmal-py.h index a0a5b6f..ee79fd6 100644 --- a/python/rpmal-py.h +++ b/python/rpmal-py.h @@ -12,8 +12,10 @@ typedef struct rpmalObject_s { rpmal al; } rpmalObject; +/*@unchecked@*/ extern PyTypeObject rpmal_Type; -rpmalObject * rpmal_Wrap(rpmal al); +rpmalObject * rpmal_Wrap(rpmal al) + /*@*/; #endif diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c index 8e689b2..e1da827 100644 --- a/python/rpmdb-py.c +++ b/python/rpmdb-py.c @@ -5,6 +5,11 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif + #include #include "rpmdb-py.h" @@ -13,6 +18,8 @@ #include "debug.h" +/*@access Header @*/ + /** \ingroup python * \class Rpmdb * \brief A python rpmdb object represents an RPM database. @@ -106,6 +113,8 @@ */ static rpmmiObject * rpmdb_Match (rpmdbObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { PyObject *TagN = NULL; char *key = NULL; @@ -125,17 +134,21 @@ rpmdb_Match (rpmdbObject * s, PyObject * args) /** */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmdb_methods[] = { {"match", (PyCFunction) rpmdb_Match, METH_VARARGS, "db.match([TagN, [key, [len]]]) -> mi\n\ - Create an rpm db match iterator.\n" }, {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /** */ static int rpmdb_length(rpmdbObject * s) + /*@modifies s @*/ { rpmdbMatchIterator mi; int count = 0; @@ -152,6 +165,7 @@ rpmdb_length(rpmdbObject * s) */ static hdrObject * rpmdb_subscript(rpmdbObject * s, PyObject * key) + /*@modifies s @*/ { int offset; hdrObject * ho; @@ -180,6 +194,7 @@ rpmdb_subscript(rpmdbObject * s, PyObject * key) /** */ +/*@unchecked@*/ /*@observer@*/ static PyMappingMethods rpmdb_as_mapping = { (inquiry) rpmdb_length, /* mp_length */ (binaryfunc) rpmdb_subscript, /* mp_subscript */ @@ -189,6 +204,7 @@ static PyMappingMethods rpmdb_as_mapping = { /** */ static void rpmdb_dealloc(rpmdbObject * s) + /*@modifies s @*/ { if (s->db) rpmdbClose(s->db); @@ -198,17 +214,20 @@ static void rpmdb_dealloc(rpmdbObject * s) /** */ static PyObject * rpmdb_getattr(rpmdbObject * s, char * name) + /*@*/ { return Py_FindMethod(rpmdb_methods, (PyObject * ) s, name); } /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmdb_doc[] = ""; /** */ +/*@-fullinitblock@*/ PyTypeObject rpmdb_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ @@ -254,6 +273,7 @@ PyTypeObject rpmdb_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ rpmdb dbFromDb(rpmdbObject * db) { @@ -262,7 +282,7 @@ rpmdb dbFromDb(rpmdbObject * db) /** */ -rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) { +rpmdbObject * rpmOpenDB(/*@unused@*/ PyObject * self, PyObject * args) { rpmdbObject * o; char * root = ""; int forWrite = 0; @@ -281,7 +301,9 @@ rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) { /* PyErr_SetString should take varargs... */ errsize = strlen(errmsg) + *root == '\0' ? 15 /* "/var/lib/rpm" */ : strlen(root); errstr = alloca(errsize); +/*@-formatconst@*/ snprintf(errstr, errsize, errmsg, *root == '\0' ? "/var/lib/rpm" : root); +/*@=formatconst@*/ PyErr_SetString(pyrpmError, errstr); return NULL; } @@ -291,7 +313,7 @@ rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) { /** */ -PyObject * rebuildDB (PyObject * self, PyObject * args) +PyObject * rebuildDB (/*@unused@*/ PyObject * self, PyObject * args) { char * root = ""; diff --git a/python/rpmdb-py.h b/python/rpmdb-py.h index f0f5793..8c088d5 100644 --- a/python/rpmdb-py.h +++ b/python/rpmdb-py.h @@ -14,18 +14,23 @@ typedef struct rpmdbObject_s rpmdbObject; /** \ingroup python */ struct rpmdbObject_s { - PyObject_HEAD; + PyObject_HEAD rpmdb db; int offx; int noffs; int *offsets; } ; +/*@unchecked@*/ extern PyTypeObject rpmdb_Type; -rpmdb dbFromDb(rpmdbObject * db); +rpmdb dbFromDb(rpmdbObject * db) + /*@*/; -rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args); -PyObject * rebuildDB (PyObject * self, PyObject * args); +rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) + /*@*/; +PyObject * rebuildDB (PyObject * self, PyObject * args) + /*@globals rpmGlobalMacroContext @*/ + /*@modifies rpmGlobalMacroContext @*/; #endif diff --git a/python/rpmds-py.c b/python/rpmds-py.c index 4309478..8ec6275 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include @@ -13,8 +17,12 @@ #include "debug.h" +/*@access rpmds @*/ + static PyObject * -rpmds_Debug(rpmdsObject * s, PyObject * args) +rpmds_Debug(/*@unused@*/ rpmdsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, "i", &_rpmds_debug)) return NULL; Py_INCREF(Py_None); @@ -23,6 +31,7 @@ rpmds_Debug(rpmdsObject * s, PyObject * args) static PyObject * rpmds_Count(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Count")) return NULL; return Py_BuildValue("i", rpmdsCount(s->ds)); @@ -30,6 +39,7 @@ rpmds_Count(rpmdsObject * s, PyObject * args) static PyObject * rpmds_Ix(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Ix")) return NULL; return Py_BuildValue("i", rpmdsIx(s->ds)); @@ -37,6 +47,7 @@ rpmds_Ix(rpmdsObject * s, PyObject * args) static PyObject * rpmds_DNEVR(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":DNEVR")) return NULL; return Py_BuildValue("s", rpmdsDNEVR(s->ds)); @@ -44,6 +55,7 @@ rpmds_DNEVR(rpmdsObject * s, PyObject * args) static PyObject * rpmds_N(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":N")) return NULL; return Py_BuildValue("s", rpmdsN(s->ds)); @@ -51,6 +63,7 @@ rpmds_N(rpmdsObject * s, PyObject * args) static PyObject * rpmds_EVR(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":EVR")) return NULL; return Py_BuildValue("s", rpmdsEVR(s->ds)); @@ -58,6 +71,7 @@ rpmds_EVR(rpmdsObject * s, PyObject * args) static PyObject * rpmds_Flags(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Flags")) return NULL; return Py_BuildValue("i", rpmdsFlags(s->ds)); @@ -65,6 +79,7 @@ rpmds_Flags(rpmdsObject * s, PyObject * args) static PyObject * rpmds_TagN(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":TagN")) return NULL; return Py_BuildValue("i", rpmdsTagN(s->ds)); @@ -72,6 +87,7 @@ rpmds_TagN(rpmdsObject * s, PyObject * args) static int rpmds_compare(rpmdsObject * a, rpmdsObject * b) + /*@*/ { return rpmdsCompare(a->ds, b->ds); } @@ -79,6 +95,8 @@ rpmds_compare(rpmdsObject * a, rpmdsObject * b) #if Py_TPFLAGS_HAVE_ITER static PyObject * rpmds_Next(rpmdsObject * s) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { PyObject * result = NULL; @@ -105,6 +123,7 @@ rpmds_Next(rpmdsObject * s) static PyObject * rpmds_Iter(rpmdsObject * s) + /*@modifies s @*/ { rpmdsInit(s->ds); Py_INCREF(s); @@ -115,6 +134,7 @@ rpmds_Iter(rpmdsObject * s) #ifdef NOTYET static PyObject * rpmds_Notify(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Notify")) return NULL; @@ -124,6 +144,7 @@ rpmds_Notify(rpmdsObject * s, PyObject * args) static PyObject * rpmds_Problem(rpmdsObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Problem")) return NULL; @@ -132,6 +153,8 @@ rpmds_Problem(rpmdsObject * s, PyObject * args) } #endif +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmds_methods[] = { {"Debug", (PyCFunction)rpmds_Debug, METH_VARARGS, NULL}, @@ -163,11 +186,13 @@ static struct PyMethodDef rpmds_methods[] = { #endif {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /* ---------- */ static void rpmds_dealloc(rpmdsObject * s) + /*@modifies s @*/ { if (s) { s->ds = rpmdsFree(s->ds); @@ -176,7 +201,9 @@ rpmds_dealloc(rpmdsObject * s) } static int -rpmds_print(rpmdsObject * s, FILE * fp, int flags) +rpmds_print(rpmdsObject * s, FILE * fp, /*@unused@*/ int flags) + /*@globals fileSystem @*/ + /*@modifies s, fp, fileSystem @*/ { if (!(s && s->ds)) return -1; @@ -189,18 +216,21 @@ rpmds_print(rpmdsObject * s, FILE * fp, int flags) static PyObject * rpmds_getattr(rpmdsObject * s, char * name) + /*@*/ { return Py_FindMethod(rpmds_methods, (PyObject *)s, name); } static int rpmds_length(rpmdsObject * s) + /*@*/ { return rpmdsCount(s->ds); } static PyObject * rpmds_subscript(rpmdsObject * s, PyObject * key) + /*@modifies s @*/ { int ix; @@ -222,9 +252,11 @@ static PyMappingMethods rpmds_as_mapping = { /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmds_doc[] = ""; +/*@-fullinitblock@*/ PyTypeObject rpmds_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ @@ -271,6 +303,7 @@ PyTypeObject rpmds_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ /* ---------- */ @@ -290,7 +323,7 @@ rpmds_Wrap(rpmds ds) } rpmdsObject * -rpmds_Single(PyObject * s, PyObject * args) +rpmds_Single(/*@unused@*/ PyObject * s, PyObject * args) { int tagN = RPMTAG_PROVIDENAME; const char * N; @@ -303,7 +336,7 @@ rpmds_Single(PyObject * s, PyObject * args) } rpmdsObject * -hdr_dsFromHeader(PyObject * s, PyObject * args) +hdr_dsFromHeader(/*@unused@*/ PyObject * s, PyObject * args) { hdrObject * ho; int tagN = RPMTAG_REQUIRENAME; @@ -315,7 +348,7 @@ hdr_dsFromHeader(PyObject * s, PyObject * args) } rpmdsObject * -hdr_dsOfHeader(PyObject * s, PyObject * args) +hdr_dsOfHeader(/*@unused@*/ PyObject * s, PyObject * args) { hdrObject * ho; int tagN = RPMTAG_PROVIDENAME; diff --git a/python/rpmds-py.h b/python/rpmds-py.h index edcd7ea..9a540e1 100644 --- a/python/rpmds-py.h +++ b/python/rpmds-py.h @@ -16,26 +16,32 @@ typedef struct rpmdsObject_s { /** */ +/*@unchecked@*/ extern PyTypeObject rpmds_Type; /** */ -rpmds dsFromDs(rpmdsObject * ds); +rpmds dsFromDs(rpmdsObject * ds) + /*@*/; /** */ -rpmdsObject * rpmds_Wrap(rpmds ds); +rpmdsObject * rpmds_Wrap(rpmds ds) + /*@*/; /** */ -rpmdsObject * rpmds_Single(PyObject * s, PyObject * args); +rpmdsObject * rpmds_Single(PyObject * s, PyObject * args) + /*@*/; /** */ -rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args); +rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args) + /*@*/; /** */ -rpmdsObject * hdr_dsOfHeader(PyObject * s, PyObject * args); +rpmdsObject * hdr_dsOfHeader(PyObject * s, PyObject * args) + /*@*/; #endif diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c index 3cd9a2a..9582cde 100644 --- a/python/rpmfd-py.c +++ b/python/rpmfd-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include /* XXX rpmio.h */ #include /* XXX rpmio.h */ @@ -17,6 +21,8 @@ #include "debug.h" +/*@access FD_t @*/ + extern int _rpmio_debug; /** \ingroup python @@ -26,7 +32,9 @@ extern int _rpmio_debug; */ static PyObject * -rpmfd_Debug(rpmfdObject * s, PyObject * args) +rpmfd_Debug(/*@unused@*/ rpmfdObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, "i", &_rpmio_debug)) return NULL; Py_INCREF(Py_None); @@ -57,6 +65,8 @@ static FDlist *fdtail = NULL; /** */ static int closeCallback(FILE * f) + /*@globals fdhead @*/ + /*@modifies fdhead @*/ { FDlist *node, *last; @@ -86,7 +96,9 @@ static int closeCallback(FILE * f) /** */ static PyObject * -rpmfd_Fopen(PyObject * self, PyObject * args) +rpmfd_Fopen(/*@unused@*/ PyObject * self, PyObject * args) + /*@globals fdhead, fdtail @*/ + /*@modifies fdhead, fdtail @*/ { char * path, * mode; FDlist *node; @@ -136,6 +148,8 @@ rpmfd_Fopen(PyObject * self, PyObject * args) /** \ingroup python */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmfd_methods[] = { {"Debug", (PyCFunction)rpmfd_Debug, METH_VARARGS, NULL}, @@ -143,23 +157,27 @@ static struct PyMethodDef rpmfd_methods[] = { NULL}, {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /* ---------- */ /** \ingroup python */ static PyObject * rpmfd_getattr(rpmfdObject * o, char * name) + /*@*/ { return Py_FindMethod(rpmfd_methods, (PyObject *) o, name); } /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmfd_doc[] = ""; /** \ingroup python */ +/*@-fullinitblock@*/ PyTypeObject rpmfd_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ @@ -205,6 +223,7 @@ PyTypeObject rpmfd_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ rpmfdObject * rpmfd_Wrap(FD_t fd) { diff --git a/python/rpmfd-py.h b/python/rpmfd-py.h index eed1dcc..5ab81d6 100644 --- a/python/rpmfd-py.h +++ b/python/rpmfd-py.h @@ -10,8 +10,10 @@ typedef struct rpmfdObject_s { FD_t fd; } rpmfdObject; +/*@unchecked@*/ extern PyTypeObject rpmfd_Type; -rpmfdObject * rpmfd_Wrap(FD_t fd); +rpmfdObject * rpmfd_Wrap(FD_t fd) + /*@*/; #endif diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index 051d2e0..f2551cb 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include @@ -13,8 +17,12 @@ #include "debug.h" +/*@access rpmfi @*/ + static PyObject * -rpmfi_Debug(rpmfiObject * s, PyObject * args) +rpmfi_Debug(/*@unused@*/ rpmfiObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, "i", &_rpmfi_debug)) return NULL; Py_INCREF(Py_None); @@ -23,6 +31,7 @@ rpmfi_Debug(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FC(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FC")) return NULL; return Py_BuildValue("i", rpmfiFC(s->fi)); @@ -30,6 +39,7 @@ rpmfi_FC(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FX(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FX")) return NULL; return Py_BuildValue("i", rpmfiFX(s->fi)); @@ -37,6 +47,7 @@ rpmfi_FX(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_DC(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":DC")) return NULL; return Py_BuildValue("i", rpmfiDC(s->fi)); @@ -44,6 +55,7 @@ rpmfi_DC(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_DX(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":DX")) return NULL; return Py_BuildValue("i", rpmfiDX(s->fi)); @@ -51,6 +63,7 @@ rpmfi_DX(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_BN(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":BN")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiBN(s->fi))); @@ -58,6 +71,7 @@ rpmfi_BN(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_DN(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":DN")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiDN(s->fi))); @@ -65,6 +79,7 @@ rpmfi_DN(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FN(rpmfiObject * s, PyObject * args) + /*@modifies s @*/ { if (!PyArg_ParseTuple(args, ":FN")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiFN(s->fi))); @@ -72,6 +87,7 @@ rpmfi_FN(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FFlags(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FFlags")) return NULL; return Py_BuildValue("i", rpmfiFFlags(s->fi)); @@ -79,6 +95,7 @@ rpmfi_FFlags(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_VFlags(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":VFlags")) return NULL; return Py_BuildValue("i", rpmfiVFlags(s->fi)); @@ -86,6 +103,7 @@ rpmfi_VFlags(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FMode(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FMode")) return NULL; return Py_BuildValue("i", rpmfiFMode(s->fi)); @@ -93,6 +111,7 @@ rpmfi_FMode(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FState(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FState")) return NULL; return Py_BuildValue("i", rpmfiFState(s->fi)); @@ -101,6 +120,7 @@ rpmfi_FState(rpmfiObject * s, PyObject * args) /* XXX rpmfiMD5 */ static PyObject * rpmfi_MD5(rpmfiObject * s, PyObject * args) + /*@*/ { const unsigned char * md5; char fmd5[33]; @@ -117,6 +137,7 @@ rpmfi_MD5(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FLink(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FLink")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiFLink(s->fi))); @@ -124,6 +145,7 @@ rpmfi_FLink(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FSize(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FSize")) return NULL; return Py_BuildValue("i", rpmfiFSize(s->fi)); @@ -131,6 +153,7 @@ rpmfi_FSize(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FRdev(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FRdev")) return NULL; return Py_BuildValue("i", rpmfiFRdev(s->fi)); @@ -138,6 +161,7 @@ rpmfi_FRdev(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FMtime(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FMtime")) return NULL; return Py_BuildValue("i", rpmfiFMtime(s->fi)); @@ -145,6 +169,7 @@ rpmfi_FMtime(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FUser(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FUser")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiFUser(s->fi))); @@ -152,6 +177,7 @@ rpmfi_FUser(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_FGroup(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":FGroup")) return NULL; return Py_BuildValue("s", xstrdup(rpmfiFGroup(s->fi))); @@ -159,7 +185,8 @@ rpmfi_FGroup(rpmfiObject * s, PyObject * args) #if Py_TPFLAGS_HAVE_ITER static PyObject * -rpmfi_Next(rpmfiObject * s, PyObject * args) +rpmfi_Next(rpmfiObject * s, /*@unused@*/ PyObject * args) + /*@modifies s @*/ { PyObject * result = NULL; @@ -183,7 +210,8 @@ rpmfi_Next(rpmfiObject * s, PyObject * args) } static PyObject * -rpmfi_Iter(rpmfiObject * s, PyObject * args) +rpmfi_Iter(rpmfiObject * s, /*@unused@*/ PyObject * args) + /*@modifies s @*/ { rpmfiInit(s->fi, 0); Py_INCREF(s); @@ -194,6 +222,7 @@ rpmfi_Iter(rpmfiObject * s, PyObject * args) #ifdef NOTYET static PyObject * rpmfi_NextD(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":NextD")) return NULL; @@ -203,6 +232,7 @@ rpmfi_NextD(rpmfiObject * s, PyObject * args) static PyObject * rpmfi_InitD(rpmfiObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":InitD")) return NULL; @@ -211,6 +241,8 @@ rpmfi_InitD(rpmfiObject * s, PyObject * args) } #endif +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmfi_methods[] = { {"Debug", (PyCFunction)rpmfi_Debug, METH_VARARGS, NULL}, @@ -264,11 +296,13 @@ static struct PyMethodDef rpmfi_methods[] = { #endif {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /* ---------- */ static void -rpmfi_dealloc(rpmfiObject * s) +rpmfi_dealloc(/*@only@*/ /*@null@*/ rpmfiObject * s) + /*@modifies s @*/ { if (s) { s->fi = rpmfiFree(s->fi, 1); @@ -277,7 +311,9 @@ rpmfi_dealloc(rpmfiObject * s) } static int -rpmfi_print(rpmfiObject * s, FILE * fp, int flags) +rpmfi_print(rpmfiObject * s, FILE * fp, /*@unused@*/ int flags) + /*@globals fileSystem @*/ + /*@modifies s, fp, fileSystem @*/ { if (!(s && s->fi)) return -1; @@ -290,18 +326,21 @@ rpmfi_print(rpmfiObject * s, FILE * fp, int flags) static PyObject * rpmfi_getattr(rpmfiObject * s, char * name) + /*@*/ { return Py_FindMethod(rpmfi_methods, (PyObject *)s, name); } static int rpmfi_length(rpmfiObject * s) + /*@*/ { return rpmfiFC(s->fi); } static PyObject * rpmfi_subscript(rpmfiObject * s, PyObject * key) + /*@modifies s @*/ { int ix; @@ -315,6 +354,7 @@ rpmfi_subscript(rpmfiObject * s, PyObject * key) return Py_BuildValue("s", xstrdup(rpmfiFN(s->fi))); } +/*@unchecked@*/ /*@observer@*/ static PyMappingMethods rpmfi_as_mapping = { (inquiry) rpmfi_length, /* mp_length */ (binaryfunc) rpmfi_subscript, /* mp_subscript */ @@ -323,9 +363,11 @@ static PyMappingMethods rpmfi_as_mapping = { /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmfi_doc[] = ""; +/*@-fullinitblock@*/ PyTypeObject rpmfi_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ @@ -372,6 +414,7 @@ PyTypeObject rpmfi_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ /* ---------- */ @@ -391,7 +434,7 @@ rpmfi_Wrap(rpmfi fi) } rpmfiObject * -hdr_fiFromHeader(PyObject * s, PyObject * args) +hdr_fiFromHeader(/*@unused@*/ PyObject * s, PyObject * args) { hdrObject * ho; diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h index 8b1c9e2..b8dd4ad 100644 --- a/python/rpmfi-py.h +++ b/python/rpmfi-py.h @@ -12,12 +12,16 @@ typedef struct rpmfiObject_s { rpmfi fi; } rpmfiObject; +/*@unchecked@*/ extern PyTypeObject rpmfi_Type; -rpmfi fiFromFi(rpmfiObject * fi); +rpmfi fiFromFi(rpmfiObject * fi) + /*@*/; -rpmfiObject * rpmfi_Wrap(rpmfi fi); +rpmfiObject * rpmfi_Wrap(rpmfi fi) + /*@*/; -rpmfiObject * hdr_fiFromHeader(PyObject * s, PyObject * args); +rpmfiObject * hdr_fiFromHeader(PyObject * s, PyObject * args) + /*@*/; #endif diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c index 2d04854..7345ed8 100644 --- a/python/rpmmi-py.c +++ b/python/rpmmi-py.c @@ -5,6 +5,11 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif + #include #include "rpmdb-py.h" @@ -80,6 +85,7 @@ #if Py_TPFLAGS_HAVE_ITER static PyObject * rpmmi_Iter(rpmmiObject * s) + /*@*/ { assert(s->mi); Py_INCREF(s); @@ -90,6 +96,8 @@ assert(s->mi); */ static PyObject * rpmmi_Next(rpmmiObject * s) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { Header h; @@ -106,6 +114,8 @@ rpmmi_Next(rpmmiObject * s) */ static PyObject * rpmmi_Pattern(rpmmiObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { PyObject *TagN = NULL; int type; @@ -129,6 +139,8 @@ rpmmi_Pattern(rpmmiObject * s, PyObject * args) /** \ingroup python */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmmi_methods[] = { #if Py_TPFLAGS_HAVE_ITER {"iter", (PyCFunction) rpmmi_Iter, METH_VARARGS, @@ -142,10 +154,12 @@ static struct PyMethodDef rpmmi_methods[] = { - Set a secondary match pattern on tags from retrieved header.\n" }, {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /** \ingroup python */ -static void rpmmi_dealloc(rpmmiObject * s) +static void rpmmi_dealloc(/*@only@*/ /*@null@*/ rpmmiObject * s) + /*@modifies s @*/ { if (s) { if (s->mi) s->mi = rpmdbFreeIterator(s->mi); @@ -156,17 +170,20 @@ static void rpmmi_dealloc(rpmmiObject * s) /** \ingroup python */ static PyObject * rpmmi_getattr (rpmdbObject *s, char *name) + /*@*/ { return Py_FindMethod (rpmmi_methods, (PyObject *) s, name); } /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmmi_doc[] = ""; /** \ingroup python */ +/*@-fullinitblock@*/ PyTypeObject rpmmi_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ @@ -212,6 +229,7 @@ PyTypeObject rpmmi_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi) { diff --git a/python/rpmmi-py.h b/python/rpmmi-py.h index 9afd355..68bed7b 100644 --- a/python/rpmmi-py.h +++ b/python/rpmmi-py.h @@ -12,12 +12,15 @@ typedef struct rpmmiObject_s rpmmiObject; /** \ingroup python */ struct rpmmiObject_s { - PyObject_HEAD; + PyObject_HEAD rpmdbMatchIterator mi; } ; +/*@unchecked@*/ extern PyTypeObject rpmmi_Type; -rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi); +rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi) + /*@globals _Py_NoneStruct @*/ + /*@modifies mi, _Py_NoneStruct @*/; #endif diff --git a/python/rpmmodule.c b/python/rpmmodule.c index a3827d1..49b5c42 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -5,6 +5,11 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif + #include "rpmcli.h" /* XXX for rpmCheckSig */ #include "legacy.h" diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c index b9bff7a..ad1292d 100644 --- a/python/rpmrc-py.c +++ b/python/rpmrc-py.c @@ -5,7 +5,14 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif + #include "structmember.h" + +/*@unchecked@*/ extern PyTypeObject PyDictIter_Type; #include @@ -23,6 +30,7 @@ extern PyTypeObject PyDictIter_Type; #include "debug.h" +/*@unchecked@*/ static int _rc_debug = 0; /** \ingroup python @@ -38,6 +46,7 @@ static int _rc_debug = 0; /** */ static const char * lbl(void * s) + /*@*/ { PyObject * o = s; @@ -78,7 +87,7 @@ static const char * lbl(void * s) /** */ -PyObject * rpmrc_AddMacro(PyObject * self, PyObject * args) +PyObject * rpmrc_AddMacro(/*@unused@*/ PyObject * self, PyObject * args) { char * name, * val; @@ -93,7 +102,7 @@ PyObject * rpmrc_AddMacro(PyObject * self, PyObject * args) /** */ -PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args) +PyObject * rpmrc_DelMacro(/*@unused@*/ PyObject * self, PyObject * args) { char * name; @@ -110,6 +119,7 @@ PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args) */ static PyObject * rpmrc_getstate(rpmrcObject *s, PyObject *args) + /*@*/ { if (!PyArg_ParseTuple(args, ":getstate")) return NULL; @@ -120,6 +130,8 @@ rpmrc_getstate(rpmrcObject *s, PyObject *args) */ static PyObject * rpmrc_setstate(rpmrcObject *s, PyObject *args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { int state; @@ -133,6 +145,7 @@ rpmrc_setstate(rpmrcObject *s, PyObject *args) /** */ static void rpmrc_dealloc(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_dealloc(%p[%s])\n", s, lbl(s)); @@ -142,15 +155,19 @@ fprintf(stderr, "*** rpmrc_dealloc(%p[%s])\n", s, lbl(s)); /** */ static int rpmrc_print(PyObject * s, FILE *fp, int flags) + /*@*/ { +/*@-formattype@*/ if (_rc_debug) fprintf(stderr, "*** rpmrc_print(%p[%s],%p,%x)\n", s, lbl(s), fp, flags); +/*@=formattype@*/ return PyDict_Type.tp_print(s, fp, flags); } /** */ static int rpmrc_compare(PyObject * a, PyObject * b) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_compare(%p[%s],%p[%s])\n", a, lbl(a), b, lbl(b)); @@ -160,6 +177,7 @@ fprintf(stderr, "*** rpmrc_compare(%p[%s],%p[%s])\n", a, lbl(a), b, lbl(b)); /** */ static PyObject * rpmrc_repr(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_repr(%p[%s])\n", s, lbl(s)); @@ -169,6 +187,7 @@ fprintf(stderr, "*** rpmrc_repr(%p[%s])\n", s, lbl(s)); /** */ static long rpmrc_hash(PyObject * s) + /*@*/ { /* XXX dict objects are unhashable */ if (_rc_debug) @@ -180,6 +199,7 @@ fprintf(stderr, "*** rpmrc_hash(%p[%s])\n", s, lbl(s)); */ static int rpmrc_length(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_length(%p[%s])\n", s, lbl(s)); @@ -190,6 +210,7 @@ fprintf(stderr, "*** rpmrc_length(%p[%s])\n", s, lbl(s)); */ static PyObject * rpmrc_subscript(PyObject * s, PyObject * key) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_subscript(%p[%s], %p[%s])\n", s, lbl(s), key, lbl(key)); @@ -200,12 +221,14 @@ fprintf(stderr, "*** rpmrc_subscript(%p[%s], %p[%s])\n", s, lbl(s), key, lbl(key */ static int rpmrc_ass_subscript(PyObject * s, PyObject * key, PyObject * value) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_ass_subscript(%p[%s], %p[%s], %p[%s])\n", s, lbl(s), key, lbl(key), value, lbl(value)); return PyDict_Type.tp_as_mapping->mp_ass_subscript(s, key, value); } +/*@unchecked@*/ /*@observer@*/ static PyMappingMethods rpmrc_as_mapping = { rpmrc_length, /* mp_length */ rpmrc_subscript, /* mp_subscript */ @@ -215,6 +238,7 @@ static PyMappingMethods rpmrc_as_mapping = { /** */ static PyObject * rpmrc_getattro (PyObject *s, PyObject *name) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_getattro(%p[%s], \"%s\")\n", s, lbl(s), PyString_AS_STRING(name)); @@ -224,6 +248,7 @@ fprintf(stderr, "*** rpmrc_getattro(%p[%s], \"%s\")\n", s, lbl(s), PyString_AS_S /** */ static int rpmrc_setattro (PyObject *s, PyObject *name, PyObject * value) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_setattro(%p[%s], \"%s \", \"%s\")\n", s, lbl(s), PyString_AS_STRING(name), PyString_AS_STRING(value)); @@ -232,12 +257,14 @@ fprintf(stderr, "*** rpmrc_setattro(%p[%s], \"%s \", \"%s\")\n", s, lbl(s), PySt /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmrc_doc[] = ""; /** */ static int rpmrc_traverse(PyObject * s, visitproc visit, void *arg) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_traverse(%p[%s],%p,%p)\n", s, lbl(s), visit, arg); @@ -247,6 +274,7 @@ fprintf(stderr, "*** rpmrc_traverse(%p[%s],%p,%p)\n", s, lbl(s), visit, arg); /** */ static int rpmrc_clear(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_clear(%p[%s])\n", s, lbl(s)); @@ -256,6 +284,7 @@ fprintf(stderr, "*** rpmrc_clear(%p[%s])\n", s, lbl(s)); /** */ static PyObject * rpmrc_richcompare(PyObject * v, PyObject * w, int op) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_richcompare(%p[%s],%p[%s],%x)\n", v, lbl(v), w, lbl(w), op); @@ -265,6 +294,7 @@ fprintf(stderr, "*** rpmrc_richcompare(%p[%s],%p[%s],%x)\n", v, lbl(v), w, lbl(w /** */ static PyObject * rpmrc_iter(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_iter(%p[%s])\n", s, lbl(s)); @@ -276,6 +306,7 @@ fprintf(stderr, "*** rpmrc_iter(%p[%s])\n", s, lbl(s)); /** */ static PyObject * rpmrc_iternext(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_iternext(%p[%s])\n", s, lbl(s)); @@ -287,6 +318,7 @@ fprintf(stderr, "*** rpmrc_iternext(%p[%s])\n", s, lbl(s)); /** */ static PyObject * rpmrc_next(PyObject * s, PyObject *args) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_next(%p[%s],%p)\n", s, lbl(s), args); @@ -295,15 +327,19 @@ fprintf(stderr, "*** rpmrc_next(%p[%s],%p)\n", s, lbl(s), args); return NULL; } +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static PyMemberDef rpmrc_members[] = { {"state", T_INT, offsetof(rpmrcObject, state), READONLY, "an int variable for demonstration purposes"}, {0} }; +/*@=fullinitblock@*/ /** \ingroup python */ static int rpmrc_init(PyObject * s, PyObject *args, PyObject *kwds) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_init(%p[%s],%p,%p)\n", s, lbl(s), args, kwds); @@ -316,6 +352,7 @@ fprintf(stderr, "*** rpmrc_init(%p[%s],%p,%p)\n", s, lbl(s), args, kwds); /** \ingroup python */ static void rpmrc_free(PyObject * s) + /*@*/ { if (_rc_debug) fprintf(stderr, "*** rpmrc_free(%p[%s])\n", s, lbl(s)); @@ -325,6 +362,7 @@ fprintf(stderr, "*** rpmrc_free(%p[%s])\n", s, lbl(s)); /** \ingroup python */ static PyObject * rpmrc_alloc(PyTypeObject * subtype, int nitems) + /*@*/ { PyObject * ns = PyType_GenericAlloc(subtype, nitems); @@ -336,6 +374,7 @@ fprintf(stderr, "*** rpmrc_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype) /** \ingroup python */ static PyObject * rpmrc_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) + /*@*/ { PyObject * ns; @@ -355,6 +394,8 @@ fprintf(stderr, "*** rpmrc_new(%p[%s],%p,%p) ret %p[%s]\n", subtype, lbl(subtype /** */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmrc_methods[] = { { "addMacro", (PyCFunction) rpmrc_AddMacro, METH_VARARGS, NULL }, @@ -368,9 +409,11 @@ static struct PyMethodDef rpmrc_methods[] = { "next() -- get the next value, or raise StopIteration"}, {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /** \ingroup python */ +/*@-fullinitblock@*/ PyTypeObject rpmrc_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ @@ -416,8 +459,9 @@ PyTypeObject rpmrc_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ -PyObject * rpmrc_Create(PyObject * self, PyObject *args, PyObject *kwds) +PyObject * rpmrc_Create(/*@unused@*/ PyObject * self, PyObject *args, PyObject *kwds) { return rpmrc_new(&rpmrc_Type, args, kwds); } diff --git a/python/rpmrc-py.h b/python/rpmrc-py.h index 649a52e..92e95ac 100644 --- a/python/rpmrc-py.h +++ b/python/rpmrc-py.h @@ -16,11 +16,17 @@ struct rpmrcObject_s { int state; } ; +/*@unchecked@*/ extern PyTypeObject rpmrc_Type; -PyObject * rpmrc_AddMacro(PyObject * self, PyObject * args); -PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args); +PyObject * rpmrc_AddMacro(PyObject * self, PyObject * args) + /*@globals rpmGlobalMacroContext, _Py_NoneStruct @*/ + /*@modifies rpmGlobalMacroContext, _Py_NoneStruct @*/; +PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args) + /*@globals rpmGlobalMacroContext, _Py_NoneStruct @*/ + /*@modifies rpmGlobalMacroContext, _Py_NoneStruct @*/; -PyObject * rpmrc_Create(PyObject * self, PyObject * args, PyObject * kwds); +PyObject * rpmrc_Create(PyObject * self, PyObject * args, PyObject * kwds) + /*@*/; #endif diff --git a/python/rpmte-py.c b/python/rpmte-py.c index b3bd7d8..87eb54a 100644 --- a/python/rpmte-py.c +++ b/python/rpmte-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include @@ -19,10 +23,35 @@ * \name Class: Rpmte * \class Rpmte * \brief An python rpm.te object represents an element of a transaction set. + * + * Elements of a transaction set are accessible after being added. Each + * element carries descriptive information about the added element as well + * as a file info set and dependency sets for each of the 4 typeof dependency. + * + * The rpmte class contains the following methods: + * + * - te.N() Return package name. + * - te.E() Return package epoch. + * - te.V() Return package version. + * - te.R() Return package release. + * - te.A() Return package architecture. + * - te.O() Return package operating system. + * - te.NEVR() Return package name-version-release. + * - te.Mutilib() Return package multilib attribute. + * - te.Depth() Return the level in the dependency tree (after ordering). + * - te.Npreds() Return the number of package prerequisites (after ordering). + * - te.Degree() Return the parent's degree + 1. + * - te.AddedKey() Return the packages associated key. + * - te.DS(tag) Return package dependency set. + * @param tag 'Providename', 'Requirename', 'Obsoletename', 'Conflictname' + * - te.FI(tag) Return package file info set. + * @param tag 'Basenames' */ static PyObject * -rpmte_Debug(rpmteObject * s, PyObject * args) +rpmte_Debug(/*@unused@*/ rpmteObject * s, /*@unused@*/ PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies _Py_NoneStruct @*/ { if (!PyArg_ParseTuple(args, "i", &_rpmte_debug)) return NULL; Py_INCREF(Py_None); @@ -31,6 +60,7 @@ rpmte_Debug(rpmteObject * s, PyObject * args) static PyObject * rpmte_N(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":N")) return NULL; return Py_BuildValue("s", rpmteN(s->te)); @@ -38,6 +68,7 @@ rpmte_N(rpmteObject * s, PyObject * args) static PyObject * rpmte_E(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":E")) return NULL; return Py_BuildValue("s", rpmteE(s->te)); @@ -45,6 +76,7 @@ rpmte_E(rpmteObject * s, PyObject * args) static PyObject * rpmte_V(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":V")) return NULL; return Py_BuildValue("s", rpmteV(s->te)); @@ -52,6 +84,7 @@ rpmte_V(rpmteObject * s, PyObject * args) static PyObject * rpmte_R(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":R")) return NULL; return Py_BuildValue("s", rpmteR(s->te)); @@ -59,6 +92,7 @@ rpmte_R(rpmteObject * s, PyObject * args) static PyObject * rpmte_A(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":A")) return NULL; return Py_BuildValue("s", rpmteA(s->te)); @@ -66,6 +100,7 @@ rpmte_A(rpmteObject * s, PyObject * args) static PyObject * rpmte_O(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":O")) return NULL; return Py_BuildValue("s", rpmteO(s->te)); @@ -73,6 +108,7 @@ rpmte_O(rpmteObject * s, PyObject * args) static PyObject * rpmte_NEVR(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":NEVR")) return NULL; return Py_BuildValue("s", rpmteNEVR(s->te)); @@ -80,6 +116,7 @@ rpmte_NEVR(rpmteObject * s, PyObject * args) static PyObject * rpmte_MultiLib(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":MultiLib")) return NULL; return Py_BuildValue("i", rpmteMultiLib(s->te)); @@ -87,6 +124,7 @@ rpmte_MultiLib(rpmteObject * s, PyObject * args) static PyObject * rpmte_Depth(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Depth")) return NULL; return Py_BuildValue("i", rpmteDepth(s->te)); @@ -94,6 +132,7 @@ rpmte_Depth(rpmteObject * s, PyObject * args) static PyObject * rpmte_Npreds(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Npreds")) return NULL; return Py_BuildValue("i", rpmteNpreds(s->te)); @@ -101,6 +140,7 @@ rpmte_Npreds(rpmteObject * s, PyObject * args) static PyObject * rpmte_Degree(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Degree")) return NULL; return Py_BuildValue("i", rpmteDegree(s->te)); @@ -108,6 +148,7 @@ rpmte_Degree(rpmteObject * s, PyObject * args) static PyObject * rpmte_AddedKey(rpmteObject * s, PyObject * args) + /*@*/ { if (!PyArg_ParseTuple(args, ":Degree")) return NULL; return Py_BuildValue("i", rpmteDegree(s->te)); @@ -115,6 +156,7 @@ rpmte_AddedKey(rpmteObject * s, PyObject * args) static PyObject * rpmte_DS(rpmteObject * s, PyObject * args) + /*@*/ { PyObject * TagN = NULL; rpmds ds; @@ -130,14 +172,20 @@ rpmte_DS(rpmteObject * s, PyObject * args) ds = rpmteDS(s->te, tag); if (ds == NULL) { +#ifdef DYING PyErr_SetString(PyExc_TypeError, "invalid ds tag"); return NULL; +#else + Py_INCREF(Py_None); + return Py_None; +#endif } - return (PyObject *) rpmds_Wrap(ds); + return (PyObject *) rpmds_Wrap(rpmdsLink(ds, "rpmte_DS")); } static PyObject * rpmte_FI(rpmteObject * s, PyObject * args) + /*@*/ { PyObject * TagN = NULL; rpmfi fi; @@ -153,31 +201,45 @@ rpmte_FI(rpmteObject * s, PyObject * args) fi = rpmteFI(s->te, tag); if (fi == NULL) { +#ifdef DYING PyErr_SetString(PyExc_TypeError, "invalid fi tag"); return NULL; +#else + Py_INCREF(Py_None); + return Py_None; +#endif } - return (PyObject *) rpmfi_Wrap(fi); + return (PyObject *) rpmfi_Wrap(rpmfiLink(fi, "rpmte_FI")); } /** \ingroup python */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmte_methods[] = { {"Debug", (PyCFunction)rpmte_Debug, METH_VARARGS, NULL}, {"N", (PyCFunction)rpmte_N, METH_VARARGS, - NULL}, +"te.N() -> N\n\ +- Return element name.\n" }, {"E", (PyCFunction)rpmte_E, METH_VARARGS, - NULL}, +"te.E() -> E\n\ +- Return element epoch.\n" }, {"V", (PyCFunction)rpmte_V, METH_VARARGS, - NULL}, +"te.V() -> V\n\ +- Return element version.\n" }, {"R", (PyCFunction)rpmte_R, METH_VARARGS, - NULL}, +"te.R() -> R\n\ +- Return element release.\n" }, {"A", (PyCFunction)rpmte_A, METH_VARARGS, - NULL}, +"te.A() -> A\n\ +- Return element arch.\n" }, {"O", (PyCFunction)rpmte_O, METH_VARARGS, - NULL}, +"te.O() -> O\n\ +- Return element os.\n" }, {"NEVR", (PyCFunction)rpmte_NEVR, METH_VARARGS, - NULL}, +"te.NEVR() -> NEVR\n\ +- Return element name-version-release.\n" }, {"MultiLib",(PyCFunction)rpmte_MultiLib, METH_VARARGS, NULL}, {"Depth", (PyCFunction)rpmte_Depth, METH_VARARGS, @@ -189,28 +251,35 @@ static struct PyMethodDef rpmte_methods[] = { {"AddedKey",(PyCFunction)rpmte_AddedKey, METH_VARARGS, NULL}, {"DS", (PyCFunction)rpmte_DS, METH_VARARGS, - NULL}, +"te.DS(TagN) -> DS\n\ +- Return the TagN dependency set (or None). TagN is one of\n\ + 'Providename', 'Requirename', 'Obsoletename', 'Conflictname'\n" }, {"FI", (PyCFunction)rpmte_FI, METH_VARARGS, - NULL}, +"te.FI(TagN) -> FI\n\ +- Return the TagN dependency set (or None). TagN must be 'Basenames'.\n" }, {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /* ---------- */ /** \ingroup python */ static PyObject * rpmte_getattr(rpmteObject * o, char * name) + /*@*/ { return Py_FindMethod(rpmte_methods, (PyObject *) o, name); } /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmte_doc[] = ""; /** \ingroup python */ +/*@-fullinitblock@*/ PyTypeObject rpmte_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ @@ -256,6 +325,7 @@ PyTypeObject rpmte_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ rpmteObject * rpmte_Wrap(rpmte te) { diff --git a/python/rpmte-py.h b/python/rpmte-py.h index 4126a66..18b6267 100644 --- a/python/rpmte-py.h +++ b/python/rpmte-py.h @@ -12,8 +12,10 @@ typedef struct rpmteObject_s { rpmte te; } rpmteObject; +/*@unchecked@*/ extern PyTypeObject rpmte_Type; -rpmteObject * rpmte_Wrap(rpmte te); +rpmteObject * rpmte_Wrap(rpmte te) + /*@*/; #endif diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 84c0f3f..2e0e72d 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -5,6 +5,10 @@ #include "system.h" #include "Python.h" +#ifdef __LCLINT__ +#undef PyObject_HEAD +#define PyObject_HEAD int _PyObjectHead; +#endif #include @@ -20,6 +24,8 @@ #include "debug.h" +/*@access alKey @*/ + /** \ingroup python * \name Class: Rpmts * \class Rpmts @@ -146,6 +152,8 @@ static void rpmtsAddAvailableElement(rpmts ts, Header h, */ static PyObject * rpmts_AddInstall(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { hdrObject * h; PyObject * key; @@ -188,6 +196,8 @@ rpmts_AddInstall(rpmtsObject * s, PyObject * args) */ static PyObject * rpmts_AddErase(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { char * name; int count; @@ -221,6 +231,8 @@ rpmts_AddErase(rpmtsObject * s, PyObject * args) */ static PyObject * rpmts_Check(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { rpmps ps; rpmProblem p; @@ -306,6 +318,8 @@ rpmts_Check(rpmtsObject * s, PyObject * args) */ static PyObject * rpmts_Order(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { int xx; @@ -320,7 +334,63 @@ rpmts_Order(rpmtsObject * s, PyObject * args) /** \ingroup python */ static PyObject * +rpmts_Clean(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ +{ + int xx; + + if (!PyArg_ParseTuple(args, ":Clean")) return NULL; + + rpmtsClean(s->ts); + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_OpenDB(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ +{ + int xx; + + if (!PyArg_ParseTuple(args, ":OpenDB")) return NULL; + + if (s->ts->dbmode == -1) + s->ts->dbmode = O_RDONLY; + xx = rpmtsOpenDB(s->ts, s->ts->dbmode); + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_CloseDB(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ +{ + int xx; + + if (!PyArg_ParseTuple(args, ":CloseDB")) return NULL; + + xx = rpmtsCloseDB(s->ts); + s->ts->dbmode = -1; + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * rpmts_GetKeys(rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { const void **data = NULL; int num, i; @@ -358,9 +428,10 @@ struct rpmtsCallbackType_s { /** \ingroup python */ static void * -rpmtsCallback(const void * hd, const rpmCallbackType what, +rpmtsCallback(/*@unused@*/ const void * hd, const rpmCallbackType what, const unsigned long amount, const unsigned long total, const void * pkgKey, rpmCallbackData data) + /*@*/ { struct rpmtsCallbackType_s * cbInfo = data; PyObject * args, * result; @@ -404,6 +475,8 @@ rpmtsCallback(const void * hd, const rpmCallbackType what, /** \ingroup python */ static PyObject * rpmts_Run(rpmtsObject * s, PyObject * args) + /*@globals rpmGlobalMacroContext, _Py_NoneStruct @*/ + /*@modifies s, rpmGlobalMacroContext, _Py_NoneStruct @*/ { int flags, ignoreSet; int rc, i; @@ -455,6 +528,8 @@ static PyObject * rpmts_Run(rpmtsObject * s, PyObject * args) #if Py_TPFLAGS_HAVE_ITER static PyObject * rpmts_Next(rpmtsObject * s) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { rpmte te; @@ -474,6 +549,7 @@ rpmts_Next(rpmtsObject * s) static PyObject * rpmts_Iter(rpmtsObject * s) + /*@modifies s @*/ { s->tsi = rpmtsiInit(s->ts); s->tsiFilter = 0; @@ -486,6 +562,8 @@ rpmts_Iter(rpmtsObject * s) */ static rpmmiObject * rpmts_Match (rpmtsObject * s, PyObject * args) + /*@globals _Py_NoneStruct @*/ + /*@modifies s, _Py_NoneStruct @*/ { PyObject *TagN = NULL; char *key = NULL; @@ -514,6 +592,8 @@ rpmts_Match (rpmtsObject * s, PyObject * args) /** \ingroup python */ +/*@-fullinitblock@*/ +/*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmts_methods[] = { {"addInstall", (PyCFunction) rpmts_AddInstall, METH_VARARGS, NULL }, @@ -523,6 +603,12 @@ static struct PyMethodDef rpmts_methods[] = { NULL }, {"order", (PyCFunction) rpmts_Order, METH_VARARGS, NULL }, + {"clean", (PyCFunction) rpmts_Clean, METH_VARARGS, + NULL }, + {"openDB", (PyCFunction) rpmts_OpenDB, METH_VARARGS, + NULL }, + {"closeDB", (PyCFunction) rpmts_CloseDB, METH_VARARGS, + NULL }, {"getKeys", (PyCFunction) rpmts_GetKeys, METH_VARARGS, NULL }, {"run", (PyCFunction) rpmts_Run, METH_VARARGS, @@ -538,10 +624,12 @@ static struct PyMethodDef rpmts_methods[] = { #endif {NULL, NULL} /* sentinel */ }; +/*@=fullinitblock@*/ /** \ingroup python */ -static void rpmts_dealloc(PyObject * o) +static void rpmts_dealloc(/*@only@*/ PyObject * o) + /*@modifies o @*/ { rpmtsObject * trans = (void *) o; @@ -560,6 +648,7 @@ static void rpmts_dealloc(PyObject * o) /** \ingroup python */ static PyObject * rpmts_getattr(rpmtsObject * o, char * name) + /*@*/ { return Py_FindMethod(rpmts_methods, (PyObject *) o, name); } @@ -567,6 +656,7 @@ static PyObject * rpmts_getattr(rpmtsObject * o, char * name) /** \ingroup python */ static int rpmts_setattr(rpmtsObject * o, char * name, PyObject * val) + /*@modifies o @*/ { int i; @@ -589,11 +679,13 @@ static int rpmts_setattr(rpmtsObject * o, char * name, PyObject * val) /** */ +/*@unchecked@*/ /*@observer@*/ static char rpmts_doc[] = ""; /** \ingroup python */ +/*@-fullinitblock@*/ PyTypeObject rpmts_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ @@ -639,11 +731,12 @@ PyTypeObject rpmts_Type = { 0, /* tp_is_gc */ #endif }; +/*@=fullinitblock@*/ /** */ rpmtsObject * -rpmts_Create(PyObject * self, PyObject * args) +rpmts_Create(/*@unused@*/ PyObject * self, PyObject * args) { rpmtsObject * o; rpmdbObject * db = NULL; diff --git a/python/rpmts-py.h b/python/rpmts-py.h index 6dfaad1..9d50038 100644 --- a/python/rpmts-py.h +++ b/python/rpmts-py.h @@ -17,6 +17,7 @@ typedef struct rpmtsObject_s { rpmElementType tsiFilter; } rpmtsObject; +/*@unchecked@*/ extern PyTypeObject rpmts_Type; /* XXX These names/constants have been removed from the rpmlib API. */ @@ -25,6 +26,7 @@ enum { RPMDEP_SENSE_CONFLICTS /*!< conflict was found. */ }; -rpmtsObject * rpmts_Create(PyObject * s, PyObject * args); +rpmtsObject * rpmts_Create(PyObject * s, PyObject * args) + /*@*/; #endif diff --git a/python/upgrade.c b/python/upgrade.c index 0fd54ec..5832ea0 100644 --- a/python/upgrade.c +++ b/python/upgrade.c @@ -2,11 +2,9 @@ * \file python/upgrade.c */ -#include -#include -#include +#include "system.h" + #include -#include #include /* XXX rpmio.h */ #include /* XXX rpmio.h */ @@ -17,6 +15,8 @@ #include "hash.h" #include "upgrade.h" +#include "debug.h" + #define MAXPKGS 1024 #define USEDEBUG 0 @@ -170,7 +170,7 @@ static int findPackagesWithObsoletes(rpmdb db, struct pkgSet *psp) while (obsoletesCount--) { if (rpmdbCountPackages(db, obsoletes[obsoletesCount]) > 0) { (*pip)->selected = 1; - break; + /*@innerbreak@*/ break; } } @@ -228,7 +228,7 @@ static int findUpgradePackages(rpmdb db, struct pkgSet *psp, /* already have a newer version installed */ DEBUG (("Already have newer version\n")) skipThis = 1; - break; + /*@innerbreak@*/ break; } } mi = rpmdbFreeIterator(mi); @@ -329,7 +329,7 @@ static int removeMovedFilesAlreadyHandled(struct pkgSet *psp, availFiles[i]); DEBUG (("File already in %s: %s%s\n", name, availDirs[availDirIndexes[i]], availFiles[i])) - break; + /*@innerbreak@*/ break; } } @@ -375,7 +375,7 @@ static int findPackagesWithRelocatedFiles(struct pkgSet *psp, { for (i = 0; i < availFileCount; i++) { - if (S_ISDIR(availFileModes[i])) continue; + if (S_ISDIR(availFileModes[i])) /*@innercontinue@*/ continue; if (htInTable(ht, availDirs[availDirIndexes[i]], availFiles[i])) { @@ -446,7 +446,7 @@ static int unmarkPackagesAlreadyInstalled(rpmdb db, struct pkgSet *psp) /* already have a newer version installed */ DEBUG (("Already have newer version\n")) (*pip)->selected = 0; - break; + /*@innerbreak@*/ break; } } mi = rpmdbFreeIterator(mi); diff --git a/rpm.spec.in b/rpm.spec.in index b8ea06c..3da47eb 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -514,6 +514,9 @@ fi %{__prefix}/include/popt.h %changelog +* Sun Jul 14 2002 Jeff Johnson 4.1-0.49 +- python: sanity check fixes on rpmts/rpmte methods. + * Sat Jul 13 2002 Jeff Johnson 4.1-0.48 - install rpmal.h and rpmhash.h, implicit rpmps.hinclude, for now. - revert headerFree/headerLink/headerUnlink debugging. diff --git a/rpmdb/.lclintrc b/rpmdb/.lclintrc index 36f536c..4689c17 100644 --- a/rpmdb/.lclintrc +++ b/rpmdb/.lclintrc @@ -15,6 +15,7 @@ # --- in progress +bounds +slovak-fcns +-bufferoverflowhigh # --- +partial artifacts -declundef diff --git a/rpmio/.lclintrc b/rpmio/.lclintrc index 47210a3..d82306b 100644 --- a/rpmio/.lclintrc +++ b/rpmio/.lclintrc @@ -14,6 +14,7 @@ # --- in progress +bounds +-bufferoverflowhigh # --- +partial artifacts -declundef -- 2.7.4