From ec22ac6d3cbfac0130049c816023b9766095353e Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 21 Dec 2002 01:05:44 +0000 Subject: [PATCH] Sanity. CVS patchset: 5955 CVS date: 2002/12/21 01:05:44 --- lib/rpmal.c | 10 +++++++--- lib/rpmte.c | 12 ++++++++++++ po/cs.po | 6 +++--- po/da.po | 6 +++--- po/de.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/gl.po | 6 +++--- po/is.po | 6 +++--- po/ja.po | 6 +++--- po/ko.po | 6 +++--- po/no.po | 6 +++--- po/pl.po | 6 +++--- po/pt.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ro.po | 6 +++--- po/rpm.pot | 6 +++--- po/ru.po | 6 +++--- po/sk.po | 6 +++--- po/sl.po | 8 ++++---- po/sr.po | 6 +++--- po/sv.po | 6 +++--- po/tr.po | 6 +++--- 23 files changed, 83 insertions(+), 67 deletions(-) diff --git a/lib/rpmal.c b/lib/rpmal.c index 30dbb72..c845615 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -627,6 +627,7 @@ rpmalAllFileSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp) const char * fileName; if (keyp) *keyp = RPMAL_NOMATCH; + if (al == NULL || (fileName = rpmdsN(ds)) == NULL || *fileName != '/') return NULL; @@ -696,9 +697,10 @@ fprintf(stderr, "==> fie %p %s\n", fie, (fie->baseName ? fie->baseName : "(nil)" alp = al->list + fie->pkgNum; ret = xrealloc(ret, (found+2) * sizeof(*ret)); if (ret) /* can't happen */ - ret[found++] = alp->key; + ret[found] = alp->key; if (keyp) *keyp = alNum2Key(al, fie->pkgNum); + found++; } /*@=branchstate@*/ @@ -727,10 +729,11 @@ rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp) return ret; if (*KName == '/') { + /* First, look for files "contained" in package ... */ ret = rpmalAllFileSatisfiesDepend(al, ds, keyp); - /* XXX Provides: /path was broken with added packages (#52183). */ if (ret != NULL && *ret != NULL) return ret; + /* ... then, look for files "provided" by package. */ } ai = &al->index; @@ -777,9 +780,10 @@ rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp) if (rc) { ret = xrealloc(ret, (found + 2) * sizeof(*ret)); if (ret) /* can't happen */ - ret[found++] = alp->key; + ret[found] = alp->key; if (keyp) *keyp = ((alKey)(alp - al->list)); + found++; } /*@=branchstate@*/ } diff --git a/lib/rpmte.c b/lib/rpmte.c index 3c72914..78cc162 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.c @@ -33,6 +33,12 @@ void rpmteCleanDS(rpmte te) } /** + * Destroy transaction element data. + * @param ts transaction set + * @param p transaction element + * @param h header + * @param key (TR_ADDED) package retrieval key (e.g. file name) + * @param relocs (TR_ADDED) package file relocations */ static void delTE(rpmte p) /*@globals fileSystem @*/ @@ -74,6 +80,12 @@ static void delTE(rpmte p) } /** + * Initialize transaction element data from header. + * @param ts transaction set + * @param p transaction element + * @param h header + * @param key (TR_ADDED) package retrieval key (e.g. file name) + * @param relocs (TR_ADDED) package file relocations */ /*@-bounds@*/ static void addTE(rpmts ts, rpmte p, Header h, diff --git a/po/cs.po b/po/cs.po index a1ff546..1443e04 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2367,12 +2367,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "©patný soubor: %s: %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (pøidáno poskytuje)\n" diff --git a/po/da.po b/po/da.po index c62e374..7170693 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -2380,12 +2380,12 @@ msgstr "post %d kunne ikke l msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (tilføjede 'provide')\n" diff --git a/po/de.po b/po/de.po index ed822d5..11b9b18 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2546,12 +2546,12 @@ msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" # , c-format -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/fi.po b/po/fi.po index 85f2c5d..600b48a 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -2425,12 +2425,12 @@ msgstr "tietuetta %d ei voitu lukea\n" msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/fr.po b/po/fr.po index 62b1ca4..eb757af 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2464,12 +2464,12 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/gl.po b/po/gl.po index 7dbe4cf..6135243 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2291,11 +2291,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/is.po b/po/is.po index ad56bb7..2d104e3 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2318,11 +2318,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/ja.po b/po/ja.po index bf481cd..9f0b084 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -2461,12 +2461,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" diff --git a/po/ko.po b/po/ko.po index 4ff8be0..d7cfe30 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -2356,12 +2356,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (Á¦°øÀÌ Ãß°¡µÊ)\n" diff --git a/po/no.po b/po/no.po index e4466b2..c4e6cc1 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2345,11 +2345,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/pl.po b/po/pl.po index 3710c8e..7a9477c 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2425,12 +2425,12 @@ msgstr "nie mo msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/pt.po b/po/pt.po index 3aae06e..0c4e7af 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-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" @@ -2291,11 +2291,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 9da8f07..da309f3 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2297,11 +2297,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 5588f23..9f9154c 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -2338,11 +2338,11 @@ msgstr " msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "(ÆÁÊÌÙ ÄÏÂÁ×ÌÅÎÙ)" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "(added provide)" diff --git a/po/sk.po b/po/sk.po index e0fdd3b..06d4910 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2423,12 +2423,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "chybný stav súboru: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/sl.po b/po/sl.po index d404dce..d3437ac 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.341 2002/12/20 18:36:55 jbj Exp $ +# $Id: sl.po,v 1.342 2002/12/21 01:06:18 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2423,12 +2423,12 @@ msgstr "zapisa %d ni mo msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (dodane ponudbe)\n" diff --git a/po/sr.po b/po/sr.po index b115a50..54f01d0 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -2416,12 +2416,12 @@ msgstr "ne mogu da pro msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "" diff --git a/po/sv.po b/po/sv.po index 19f6b95..375350e 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2322,11 +2322,11 @@ msgstr "post %u kunde inte l msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 msgid "(added files)" msgstr "(lade till filer)" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 msgid "(added provide)" msgstr "(lade till tillhandahållande)" diff --git a/po/tr.po b/po/tr.po index 0f5aab5..2d6d138 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-20 13:33-0500\n" +"POT-Creation-Date: 2002-12-20 20:03-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -2385,12 +2385,12 @@ msgstr "%u. kay msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" -#: lib/rpmal.c:694 +#: lib/rpmal.c:695 #, fuzzy msgid "(added files)" msgstr "db dosyasý %s hatalý\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:774 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (önlem eklendi)\n" -- 2.7.4