From 24e9464d2e30b02b4178198947b45fb45c165cbb Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 30 Dec 2002 02:37:01 +0000 Subject: [PATCH] - use rpmfiFDepends() underneath --fileprovide and --filerequire. - python: add fi.FColor() and fi.FClass() methods. - calculate dependency color and refernces. - python: add ds.Color() and ds.Refs() methods. CVS patchset: 5987 CVS date: 2002/12/30 02:37:01 --- CHANGES | 6 ++++- lib/rpmds.c | 63 +++++++++++++++++++++++++++++++++++++++++++++-- lib/rpmds.h | 40 +++++++++++++++++++++++++++++- lib/rpmte.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- lib/rpmte.h | 10 +++++++- po/cs.po | 18 +++++++------- po/da.po | 18 +++++++------- po/de.po | 18 +++++++------- po/fi.po | 18 +++++++------- po/fr.po | 18 +++++++------- po/gl.po | 18 +++++++------- po/is.po | 18 +++++++------- po/ja.po | 18 +++++++------- po/ko.po | 18 +++++++------- po/no.po | 18 +++++++------- po/pl.po | 18 +++++++------- po/pt.po | 18 +++++++------- po/pt_BR.po | 18 +++++++------- po/ro.po | 18 +++++++------- po/rpm.pot | 18 +++++++------- po/ru.po | 18 +++++++------- po/sk.po | 18 +++++++------- po/sl.po | 20 +++++++-------- po/sr.po | 18 +++++++------- po/sv.po | 18 +++++++------- po/tr.po | 18 +++++++------- python/rpmds-py.c | 20 +++++++++++++++ rpm.spec.in | 5 +++- 28 files changed, 400 insertions(+), 197 deletions(-) diff --git a/CHANGES b/CHANGES index 3ab58af..10d1e9d 100644 --- a/CHANGES +++ b/CHANGES @@ -88,7 +88,11 @@ - python: eliminate hash.[ch] and upgrade.[ch], methods too. - fix :armor query extension, tgpg mktmp handling (#80684). - use rpmfiFClass() underneath --fileclass. - - use rpmfiFDepends() underneath --fileprovide/--filerequire. + - use rpmfiFDepends() underneath --fileprovide and --filerequire. + - python: add fi.FColor() and fi.FClass() methods. + - calculate dependency color and refernces. + - python: add ds.Color() and ds.Refs() methods. + 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/lib/rpmds.c b/lib/rpmds.c index 75fd677..7d05e53 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -101,6 +101,8 @@ fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count); /*@=branchstate@*/ ds->DNEVR = _free(ds->DNEVR); + ds->Color = _free(ds->Color); + ds->Refs = _free(ds->Refs); (void) rpmdsUnlink(ds, ds->Type); /*@-refcounttrans -usereleased@*/ @@ -174,6 +176,8 @@ rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem) ds->Flags = memcpy(xmalloc(ds->Count * sizeof(*ds->Flags)), ds->Flags, ds->Count * sizeof(*ds->Flags)); /*@=boundsread@*/ + ds->Color = xcalloc(Count, sizeof(*ds->Color)); + ds->Refs = xcalloc(Count, sizeof(*ds->Refs)); /*@-modfilesys@*/ if (_rpmds_debug < 0) @@ -443,9 +447,8 @@ rpmTag rpmdsTagN(const rpmds ds) { rpmTag tagN = 0; - if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { + if (ds != NULL) tagN = ds->tagN; - } return tagN; } @@ -469,6 +472,62 @@ int rpmdsSetNoPromote(rpmds ds, int nopromote) return onopromote; } +int_32 rpmdsColor(const rpmds ds) +{ + int_32 Color = 0; + + if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { +/*@-boundsread@*/ + if (ds->Color != NULL) + Color = ds->Color[ds->i]; +/*@=boundsread@*/ + } + return Color; +} + +int_32 rpmdsSetColor(const rpmds ds, int_32 color) +{ + int_32 ocolor = 0; + + if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { +/*@-boundsread@*/ + if (ds->Color != NULL) { + ocolor = ds->Color[ds->i]; + ds->Color[ds->i] = color; + } +/*@=boundsread@*/ + } + return ocolor; +} + +int_32 rpmdsRefs(const rpmds ds) +{ + int_32 Refs = 0; + + if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { +/*@-boundsread@*/ + if (ds->Refs != NULL) + Refs = ds->Refs[ds->i]; +/*@=boundsread@*/ + } + return Refs; +} + +int_32 rpmdsSetRefs(const rpmds ds, int_32 refs) +{ + int_32 orefs = 0; + + if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { +/*@-boundsread@*/ + if (ds->Refs != NULL) { + orefs = ds->Refs[ds->i]; + ds->Refs[ds->i] = refs; + } +/*@=boundsread@*/ + } + return orefs; +} + void rpmdsNotify(rpmds ds, const char * where, int rc) { if (!(ds != NULL && ds->i >= 0 && ds->i < ds->Count)) diff --git a/lib/rpmds.h b/lib/rpmds.h index a09e7b2..f657cd5 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -38,7 +38,11 @@ struct rpmds_s { /*@only@*/ /*@null@*/ const char ** EVR; /*!< Epoch-Version-Release. */ /*@only@*/ /*@null@*/ - int_32 * Flags; /*!< Flags identifying context/comparison. */ + int_32 * Flags; /*!< Bit(s) identifying context/comparison. */ +/*@only@*/ /*@null@*/ + int_32 * Color; /*!< Bit(s) calculated from file color(s). */ +/*@only@*/ /*@null@*/ + int_32 * Refs; /*!< No. of file refs. */ rpmTag tagN; /*!< Header tag. */ rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */ int_32 Count; /*!< No. of elements */ @@ -238,6 +242,40 @@ int rpmdsSetNoPromote(/*@null@*/ rpmds ds, int nopromote) /*@modifies ds @*/; /** + * Return current dependency color. + * @param ds dependency set + * @return current dependency color + */ +int_32 rpmdsColor(/*@null@*/ const rpmds ds) + /*@*/; + +/** + * Return current dependency color. + * @param ds dependency set + * @param color new dependency color + * @return previous dependency color + */ +int_32 rpmdsSetColor(/*@null@*/ const rpmds ds, int_32 color) + /*@*/; + +/** + * Return current dependency file refs. + * @param ds dependency set + * @return current dependency file refs, -1 on global + */ +int_32 rpmdsRefs(/*@null@*/ const rpmds ds) + /*@*/; + +/** + * Return current dependency color. + * @param ds dependency set + * @param refs new dependency refs + * @return previous dependency refs + */ +int_32 rpmdsSetRefs(/*@null@*/ const rpmds ds, int_32 refs) + /*@*/; + +/** * Notify of results of dependency match. * @param ds dependency set * @param where where dependency was resolved (or NULL) diff --git a/lib/rpmte.c b/lib/rpmte.c index 70fcc2a..b2211a0 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -141,7 +141,6 @@ static void addTE(rpmts ts, rpmte p, Header h, p->key = key; p->fd = NULL; - p->multiLib = 0; p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL); p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem); @@ -152,6 +151,11 @@ static void addTE(rpmts ts, rpmte p, Header h, savep = rpmtsSetRelocateElement(ts, p); p->fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem); (void) rpmtsSetRelocateElement(ts, savep); + + rpmteColorDS(p, RPMTAG_PROVIDENAME); + rpmteColorDS(p, RPMTAG_REQUIRENAME); + + p->multiLib = 0; } /*@=bounds@*/ @@ -432,6 +436,73 @@ rpmfi rpmteFI(rpmte te, rpmTag tag) /*@=compdef =refcounttrans =retalias =retexpose =usereleased @*/ } +void rpmteColorDS(rpmte te, rpmTag tag) +{ + rpmfi fi = rpmteFI(te, RPMTAG_BASENAMES); + rpmds ds = rpmteDS(te, tag); + char deptype = 'R'; + char mydt; + const int_32 * ddict; + int_32 * colors; + int_32 * refs; + int_32 val; + int Count; + size_t nb; + unsigned ix; + int ndx, i; + + if (!(te && (Count = rpmdsCount(ds)) > 0 && rpmfiFC(fi) > 0)) + return; + + switch (tag) { + default: + return; + /*@notreached@*/ break; + case RPMTAG_PROVIDENAME: + deptype = 'P'; + break; + case RPMTAG_REQUIRENAME: + deptype = 'R'; + break; + } + + nb = Count * sizeof(*colors); + colors = memset(alloca(nb), 0, nb); + nb = Count * sizeof(*refs); + refs = memset(alloca(nb), -1, nb); + + /* Calculate dependency color and reference count. */ + fi = rpmfiInit(fi, 0); + if (fi != NULL) + while (rpmfiNext(fi) >= 0) { + /* XXX ignore all but lsnibble for now. */ + val = (rpmfiFColor(fi) & 0x0f); + ddict = NULL; + ndx = rpmfiFDepends(fi, &ddict); + if (ddict != NULL) + while (ndx-- > 0) { + ix = *ddict++; + mydt = ((ix >> 24) & 0xff); + if (mydt != deptype) + /*@innercontinue@*/ continue; + ix &= 0x00ffffff; +assert (ix < Count); + colors[ix] |= val; + refs[ix]++; + } + } + + /* Set color/refs values in dependency set. */ + ds = rpmdsInit(ds); + while ((i = rpmdsNext(ds)) >= 0) { + val = colors[i]; + (void) rpmdsSetColor(ds, val); + val = refs[i]; + if (val >= 0) + val++; + (void) rpmdsSetRefs(ds, val); + } +} int rpmtsiOc(rpmtsi tsi) { return tsi->ocsave; diff --git a/lib/rpmte.h b/lib/rpmte.h index 6ee4dcc..61d3749 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -437,13 +437,21 @@ rpmds rpmteDS(rpmte te, rpmTag tag) /** * Retrieve file info tag set from transaction element. * @param te transaction element - * @param tag file info tag + * @param tag file info tag (RPMTAG_BASENAMES) * @return file info tag set */ rpmfi rpmteFI(rpmte te, rpmTag tag) /*@*/; /** + * Calculate transaction lemnt dependency colors/refs from file info. + * @param te transaction element + * @param tag dependency tag (RPMTAG_PROVIDENAME, RPMTAG_REQUIRENAME) + */ +void rpmteColorDS(rpmte te, rpmTag tagN) + /*@modifies te @*/; + +/** * Return transaction element index. * @param tsi transaction element iterator * @return transaction element index diff --git a/po/cs.po b/po/cs.po index 96791bc..0ba1820 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1431,7 +1431,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(není èíslo)" @@ -2486,15 +2486,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "NE " -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "ANO" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -3270,11 +3270,11 @@ msgstr "ve v msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/da.po b/po/da.po index a24fed2..55e16e3 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1430,7 +1430,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(ikke et tal)" @@ -2498,16 +2498,16 @@ msgstr ")" msgid "OK" msgstr "O.K." -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -3281,11 +3281,11 @@ msgstr "{ forventet efter : i udtryk" msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/de.po b/po/de.po index 040a922..9669857 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1557,7 +1557,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(keine Zahl)" @@ -2665,28 +2665,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -3461,11 +3461,11 @@ msgstr "{ nach : im Ausdruck erwartet" msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/fi.po b/po/fi.po index abbcdec..938bdb7 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -1452,7 +1452,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(ei ole luku)" @@ -2544,28 +2544,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -3325,11 +3325,11 @@ msgstr "odotin '{' ':'-merkin j msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/fr.po b/po/fr.po index 4f639f2..a87539c 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1478,7 +1478,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2584,28 +2584,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -3363,11 +3363,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/gl.po b/po/gl.po index ce74b70..d669af1 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1390,7 +1390,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -3172,11 +3172,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/is.po b/po/is.po index 9482075..b3fbf04 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1402,7 +1402,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2434,28 +2434,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -3203,11 +3203,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/ja.po b/po/ja.po index cf2350f..f5ca248 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1475,7 +1475,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -2581,15 +2581,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -3372,11 +3372,11 @@ msgstr " msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/ko.po b/po/ko.po index b1fa23d..27f9a80 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1418,7 +1418,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -2474,15 +2474,15 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "¿¹" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" @@ -3257,11 +3257,11 @@ msgstr "Ç¥ msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ¿Í¾ßÇÕ´Ï´Ù" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/no.po b/po/no.po index eac0536..e25c23f 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1417,7 +1417,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2461,28 +2461,28 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "JA" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -3235,11 +3235,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/pl.po b/po/pl.po index 19c5980..39d60a0 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1457,7 +1457,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -2543,29 +2543,29 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -3326,11 +3326,11 @@ msgstr "spodziewany { po : w wyra msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/pt.po b/po/pt.po index 040a18a..fc10f1a 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-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" @@ -1390,7 +1390,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -3172,11 +3172,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 50474c0..063dd8b 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1396,7 +1396,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "" @@ -2412,28 +2412,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -3178,11 +3178,11 @@ msgstr "" msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/ru.po b/po/ru.po index cf36687..a3544ab 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -1428,7 +1428,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "ÏÛÉÂËÁ rpmtsOrder, ÏÓÔÁÌÏÓØ %d ÜÌÅÍÅÎÔÏ×\n" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -2454,15 +2454,15 @@ msgstr ")" msgid "OK" msgstr "ïë" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "äá" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ %s: %s\n" @@ -3225,11 +3225,11 @@ msgstr " msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/sk.po b/po/sk.po index d74718f..6bf79f9 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1455,7 +1455,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -2541,29 +2541,29 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -3322,11 +3322,11 @@ msgstr "{ o msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/sl.po b/po/sl.po index fb91fb1..3e5f21f 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.356 2002/12/29 18:19:50 jbj Exp $ +# $Id: sl.po,v 1.357 2002/12/30 02:38:21 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-29 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1458,7 +1458,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -2541,16 +2541,16 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -3327,11 +3327,11 @@ msgstr "v izrazu je za : pri msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/sr.po b/po/sr.po index 13f1826..d5b4089 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -1445,7 +1445,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(nije broj)" @@ -2535,28 +2535,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -3316,11 +3316,11 @@ msgstr "{ o msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/sv.po b/po/sv.po index c493520..11d1592 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1414,7 +1414,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "rpmtsOrder misslyckades, %d element återstår\n" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(inte ett tal)" @@ -2438,15 +2438,15 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "JA" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" @@ -3208,11 +3208,11 @@ msgstr "{ f msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/po/tr.po b/po/tr.po index b2de5c4..352b28f 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 12:52-0500\n" +"POT-Creation-Date: 2002-12-29 21:35-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1445,7 +1445,7 @@ msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:355 -#: rpmdb/header.c:3332 rpmdb/header.c:3361 rpmdb/header.c:3385 +#: rpmdb/header.c:3334 rpmdb/header.c:3363 rpmdb/header.c:3387 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -2503,15 +2503,15 @@ msgstr ")" msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:481 lib/rpmds.c:840 +#: lib/rpmds.c:540 lib/rpmds.c:899 msgid "YES" msgstr "EVET" -#: lib/rpmds.c:805 +#: lib/rpmds.c:864 #, 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:839 +#: lib/rpmds.c:898 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:863 +#: lib/rpmds.c:922 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" @@ -3280,11 +3280,11 @@ msgstr "ifade i msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" -#: rpmdb/header.c:2832 +#: rpmdb/header.c:2833 msgid "(index out of range)" msgstr "" -#: rpmdb/header.c:3136 +#: rpmdb/header.c:3138 msgid "array iterator used with different sized arrays" msgstr "" diff --git a/python/rpmds-py.c b/python/rpmds-py.c index 123888b..534fc43 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -85,6 +85,22 @@ rpmds_TagN(rpmdsObject * s, PyObject * args) return Py_BuildValue("i", rpmdsTagN(s->ds)); } +static PyObject * +rpmds_Color(rpmdsObject * s, PyObject * args) + /*@*/ +{ + if (!PyArg_ParseTuple(args, ":Color")) return NULL; + return Py_BuildValue("i", rpmdsColor(s->ds)); +} + +static PyObject * +rpmds_Refs(rpmdsObject * s, PyObject * args) + /*@*/ +{ + if (!PyArg_ParseTuple(args, ":Refs")) return NULL; + return Py_BuildValue("i", rpmdsRefs(s->ds)); +} + static int rpmds_compare(rpmdsObject * a, rpmdsObject * b) /*@*/ @@ -213,6 +229,10 @@ static struct PyMethodDef rpmds_methods[] = { "ds.Flags -> Flags - Return current Flags.\n" }, {"TagN", (PyCFunction)rpmds_TagN, METH_VARARGS, "ds.TagN -> TagN - Return current TagN.\n" }, + {"Color", (PyCFunction)rpmds_Color, METH_VARARGS, + "ds.Color -> Color - Return current Color.\n" }, + {"Refs", (PyCFunction)rpmds_Refs, METH_VARARGS, + "ds.Refs -> Refs - Return current Refs.\n" }, {"next", (PyCFunction)rpmds_Next, METH_VARARGS, "ds.next() -> (N, EVR, Flags)\n\ - Retrieve next dependency triple.\n" }, diff --git a/rpm.spec.in b/rpm.spec.in index ee8e541..8f625f7 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -464,7 +464,10 @@ exit 0 - python: eliminate hash.[ch] and upgrade.[ch], methods too. - fix :armor query extension, tgpg mktmp handling (#80684). - use rpmfiFClass() underneath --fileclass. -- use rpmfiFDepends() underneath --fileprovide/--filerequire. +- use rpmfiFDepends() underneath --fileprovide and --filerequire. +- python: add fi.FColor() and fi.FClass() methods. +- calculate dependency color and refernces. +- python: add ds.Color() and ds.Refs() methods. * Sat Dec 28 2002 Jeff Johnson 4.2-0.45 - error if querying with iterator on different sized arrays. -- 2.7.4