From be48ddd9e2f81fa2a3d224d1d7de0c532abf6c9d Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 30 Dec 2002 14:50:33 +0000 Subject: [PATCH] - fix: typo in assertion. CVS patchset: 5988 CVS date: 2002/12/30 14:50:33 --- CHANGES | 2 +- lib/formats.c | 9 ++++++--- lib/rpmds.c | 27 ++++++++++++++------------- lib/rpmds.h | 4 ++-- lib/rpmfi.h | 6 ++++-- lib/rpmte.h | 2 +- po/cs.po | 12 ++++++------ po/da.po | 12 ++++++------ po/de.po | 12 ++++++------ po/fi.po | 12 ++++++------ po/fr.po | 12 ++++++------ po/gl.po | 12 ++++++------ po/is.po | 12 ++++++------ po/ja.po | 12 ++++++------ po/ko.po | 12 ++++++------ po/no.po | 12 ++++++------ po/pl.po | 12 ++++++------ po/pt.po | 12 ++++++------ po/pt_BR.po | 12 ++++++------ po/ro.po | 12 ++++++------ po/rpm.pot | 12 ++++++------ po/ru.po | 12 ++++++------ po/sk.po | 12 ++++++------ po/sl.po | 14 +++++++------- po/sr.po | 12 ++++++------ po/sv.po | 12 ++++++------ po/tr.po | 12 ++++++------ rpm.spec.in | 1 + 28 files changed, 156 insertions(+), 149 deletions(-) diff --git a/CHANGES b/CHANGES index 10d1e9d..b4fbac9 100644 --- a/CHANGES +++ b/CHANGES @@ -92,7 +92,7 @@ - python: add fi.FColor() and fi.FClass() methods. - calculate dependency color and refernces. - python: add ds.Color() and ds.Refs() methods. - + - fix: typo in assertion. 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/lib/formats.c b/lib/formats.c index 7aa9363..07edb01 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -683,7 +683,8 @@ static int filenamesTag(Header h, /*@out@*/ rpmTagType * type, static int fileclassTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@modifies *type, *data, *count, *freeData @*/ + /*@globals fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { @@ -705,7 +706,8 @@ static int fileclassTag(Header h, /*@out@*/ rpmTagType * type, static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@modifies h, *type, *data, *count, *freeData @*/ + /*@globals fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { @@ -727,7 +729,8 @@ static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type, static int filerequireTag(Header h, /*@out@*/ rpmTagType * type, /*@out@*/ const void ** data, /*@out@*/ int_32 * count, /*@out@*/ int * freeData) - /*@modifies h, *type, *data, *count, *freeData @*/ + /*@globals fileSystem @*/ + /*@modifies h, *type, *data, *count, *freeData, fileSystem @*/ /*@requires maxSet(type) >= 0 /\ maxSet(data) >= 0 /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/ { diff --git a/lib/rpmds.c b/lib/rpmds.c index 7d05e53..e2afe50 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -490,12 +490,12 @@ int_32 rpmdsSetColor(const rpmds ds, int_32 color) int_32 ocolor = 0; if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { -/*@-boundsread@*/ +/*@-bounds@*/ if (ds->Color != NULL) { ocolor = ds->Color[ds->i]; ds->Color[ds->i] = color; } -/*@=boundsread@*/ +/*@=bounds@*/ } return ocolor; } @@ -518,12 +518,12 @@ int_32 rpmdsSetRefs(const rpmds ds, int_32 refs) int_32 orefs = 0; if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { -/*@-boundsread@*/ +/*@-bounds@*/ if (ds->Refs != NULL) { orefs = ds->Refs[ds->i]; ds->Refs[ds->i] = refs; } -/*@=boundsread@*/ +/*@=bounds@*/ } return orefs; } @@ -581,7 +581,8 @@ rpmds rpmdsInit(/*@null@*/ rpmds ds) } /*@-bounds@*/ -static const char ** rpmdsDupArgv(const char ** argv, int argc) +static /*@null@*/ +const char ** rpmdsDupArgv(/*@null@*/ const char ** argv, int argc) /*@*/ { const char ** av; @@ -589,6 +590,8 @@ static const char ** rpmdsDupArgv(const char ** argv, int argc) int ac = 0; char * t; + if (argv == NULL) + return NULL; for (ac = 0; ac < argc; ac++) { assert(argv[ac] != NULL); nb += strlen(argv[ac]) + 1; @@ -629,9 +632,8 @@ static rpmds rpmdsDup(const rpmds ods) ds->Nt = ods->Nt; /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ -/*@-nullderef -nullpass@*/ -assert(ds->EVR != NULL); -assert(ds->Flags != NULL); +assert(ods->EVR != NULL); +assert(ods->Flags != NULL); nb = (ds->Count+1) * sizeof(*ds->EVR); ds->EVR = (ds->h != NULL @@ -644,7 +646,6 @@ assert(ds->Flags != NULL); ? ods->Flags : memcpy(xmalloc(nb), ods->Flags, nb) ); ds->Ft = ods->Ft; -/*@=nullderef =nullpass@*/ /*@-compmempass@*/ /* FIX: ds->Flags is kept, not only */ return rpmdsLink(ds, (ds ? ds->Type : NULL)); @@ -731,9 +732,9 @@ save = ods->i; ds->N = N; /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ -/*@-nullderef@*/ -assert(ds->EVR != NULL); -assert(ds->Flags != NULL); +/*@-nullderef -nullpass -nullptrarith @*/ +assert(ods->EVR != NULL); +assert(ods->Flags != NULL); for (j = ds->Count; j > ds->u; j--) ds->EVR[j] = ds->EVR[j-1]; @@ -750,7 +751,7 @@ assert(ds->Flags != NULL); Flags[ds->u] = ods->Flags[ods->i]; ds->Flags = _free(ds->Flags); ds->Flags = Flags; -/*@=nullderef@*/ +/*@=nullderef =nullpass =nullptrarith @*/ ds->i = ds->Count; ds->Count++; diff --git a/lib/rpmds.h b/lib/rpmds.h index f657cd5..101ad98 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -256,7 +256,7 @@ int_32 rpmdsColor(/*@null@*/ const rpmds ds) * @return previous dependency color */ int_32 rpmdsSetColor(/*@null@*/ const rpmds ds, int_32 color) - /*@*/; + /*@modifies ds @*/; /** * Return current dependency file refs. @@ -273,7 +273,7 @@ int_32 rpmdsRefs(/*@null@*/ const rpmds ds) * @return previous dependency refs */ int_32 rpmdsSetRefs(/*@null@*/ const rpmds ds, int_32 refs) - /*@*/; + /*@modifies ds @*/; /** * Notify of results of dependency match. diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 7950422..0993be0 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -500,7 +500,8 @@ rpmfi rpmfiNew(/*@null@*/ rpmts ts, Header h, rpmTag tagN, int scareMem) */ void rpmfiBuildFClasses(Header h, /*@out@*/ const char *** fclassp, /*@out@*/ int * fcp) - /*@modifies *fclassp, *fcp @*/; + /*@globals fileSystem @*/ + /*@modifies h, *fclassp, *fcp, fileSystem @*/; /** * Retrieve per-file dependencies from header. @@ -514,7 +515,8 @@ void rpmfiBuildFClasses(Header h, */ void rpmfiBuildFDeps(Header h, rpmTag tagN, /*@out@*/ const char *** fdepsp, /*@out@*/ int * fcp) - /*@modifies h, *fdepsp, *fcp @*/; + /*@globals fileSystem @*/ + /*@modifies h, *fdepsp, *fcp, fileSystem @*/; /** * Return file type from mode_t. diff --git a/lib/rpmte.h b/lib/rpmte.h index 61d3749..8fe7749 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -448,7 +448,7 @@ rpmfi rpmteFI(rpmte te, rpmTag tag) * @param te transaction element * @param tag dependency tag (RPMTAG_PROVIDENAME, RPMTAG_REQUIRENAME) */ -void rpmteColorDS(rpmte te, rpmTag tagN) +void rpmteColorDS(rpmte te, rpmTag tag) /*@modifies te @*/; /** diff --git a/po/cs.po b/po/cs.po index 0ba1820..a8e2051 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2486,15 +2486,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "NE " -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "ANO" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2503,13 +2503,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" diff --git a/po/da.po b/po/da.po index 55e16e3..ff35cfd 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -2498,16 +2498,16 @@ msgstr ")" msgid "OK" msgstr "O.K." -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2516,13 +2516,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" diff --git a/po/de.po b/po/de.po index 9669857..f1fa16d 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2665,28 +2665,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" diff --git a/po/fi.po b/po/fi.po index 938bdb7..513dc96 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -2544,28 +2544,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" diff --git a/po/fr.po b/po/fr.po index a87539c..5f1f902 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2584,28 +2584,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" diff --git a/po/gl.po b/po/gl.po index d669af1..e7b79c6 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index b3fbf04..6640ab1 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2434,28 +2434,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" diff --git a/po/ja.po b/po/ja.po index f5ca248..8ec9263 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -2581,15 +2581,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2598,13 +2598,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" diff --git a/po/ko.po b/po/ko.po index 27f9a80..2cc429e 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -2474,15 +2474,15 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "¿¹" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2491,13 +2491,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" diff --git a/po/no.po b/po/no.po index e25c23f..28e393b 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2461,28 +2461,28 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "JA" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" diff --git a/po/pl.po b/po/pl.po index 39d60a0..5d42347 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2543,29 +2543,29 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" diff --git a/po/pt.po b/po/pt.po index fc10f1a..02b89f6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\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" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 063dd8b..23492c6 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2412,28 +2412,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index a3544ab..57cd1dd 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -2454,15 +2454,15 @@ msgstr ")" msgid "OK" msgstr "ïë" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "äá" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2472,13 +2472,13 @@ msgstr "" "\"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index 6bf79f9..36181a4 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2541,29 +2541,29 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" diff --git a/po/sl.po b/po/sl.po index 3e5f21f..23c592e 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.357 2002/12/30 02:38:21 jbj Exp $ +# $Id: sl.po,v 1.358 2002/12/30 14:50:49 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2541,16 +2541,16 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2559,13 +2559,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" diff --git a/po/sr.po b/po/sr.po index d5b4089..e90ab94 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -2535,28 +2535,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" diff --git a/po/sv.po b/po/sv.po index 11d1592..0d1afda 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2438,15 +2438,15 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "JA" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2455,13 +2455,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma epok som \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" diff --git a/po/tr.po b/po/tr.po index 352b28f..c32c49b 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-12-29 21:35-0500\n" +"POT-Creation-Date: 2002-12-30 09:42-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -2503,15 +2503,15 @@ msgstr ")" msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:540 lib/rpmds.c:899 +#: lib/rpmds.c:540 lib/rpmds.c:900 msgid "YES" msgstr "EVET" -#: lib/rpmds.c:864 +#: lib/rpmds.c:865 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2520,13 +2520,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:898 +#: lib/rpmds.c:899 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:922 +#: lib/rpmds.c:923 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" diff --git a/rpm.spec.in b/rpm.spec.in index 8f625f7..eb16aea 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -468,6 +468,7 @@ exit 0 - python: add fi.FColor() and fi.FClass() methods. - calculate dependency color and refernces. - python: add ds.Color() and ds.Refs() methods. +- fix: typo in assertion. * Sat Dec 28 2002 Jeff Johnson 4.2-0.45 - error if querying with iterator on different sized arrays. -- 2.7.4