diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | lib/rpmps.c | 2 | ||||
| -rw-r--r-- | lib/rpmts.c | 8 | ||||
| -rw-r--r-- | po/cs.po | 8 | ||||
| -rw-r--r-- | po/da.po | 8 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/fi.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/gl.po | 6 | ||||
| -rw-r--r-- | po/is.po | 6 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/ko.po | 8 | ||||
| -rw-r--r-- | po/no.po | 6 | ||||
| -rw-r--r-- | po/pl.po | 6 | ||||
| -rw-r--r-- | po/pt.po | 8 | ||||
| -rw-r--r-- | po/pt_BR.po | 6 | ||||
| -rw-r--r-- | po/ro.po | 6 | ||||
| -rw-r--r-- | po/rpm.pot | 6 | ||||
| -rw-r--r-- | po/ru.po | 8 | ||||
| -rw-r--r-- | po/sk.po | 6 | ||||
| -rw-r--r-- | po/sl.po | 8 | ||||
| -rw-r--r-- | po/sr.po | 6 | ||||
| -rw-r--r-- | po/sv.po | 8 | ||||
| -rw-r--r-- | po/tr.po | 8 | ||||
| -rw-r--r-- | python/header-py.c | 2 | ||||
| -rw-r--r-- | python/poptmodule.c | 4 | ||||
| -rw-r--r-- | python/rpmdb/dbshelve.py | 2 | ||||
| -rw-r--r-- | rpm.spec.in | 8 |
28 files changed, 87 insertions, 83 deletions
@@ -127,6 +127,8 @@ - i18n: copy current production PO files to top-of-stack. - python: include rpmdb module, renamed from bsddb3. - use /etc/rpm/platform (if it exists), rather than uname(2), for arch. + - python: portability fiddles (#54350). + - check inodes (but not blocks) on FAT file systems (#64256). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/lib/rpmps.c b/lib/rpmps.c index 75b5cd910..f73690c5c 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -247,7 +247,7 @@ const char * rpmProblemString(const rpmProblem prob) break; case RPMPROB_DISKSPACE: rc = snprintf(buf, nb, - _("installing package %s needs %ld%cb on the %s filesystem"), + _("installing package %s needs %ld%cB on the %s filesystem"), pkgNEVR, prob->ulong1 > (1024*1024) ? (prob->ulong1 + 1024 * 1024 - 1) / (1024 * 1024) diff --git a/lib/rpmts.c b/lib/rpmts.c index 881cc0e3e..1a4e6bf4d 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -296,6 +296,7 @@ int rpmtsAvailable(rpmts ts, const rpmds ds) sugkey = rpmalAllSatisfiesDepend(ts->availablePackages, ds, NULL); if (sugkey == NULL) return rc; + /* XXX no alternatives yet */ if (sugkey[0] != NULL) { ts->suggests = xrealloc(ts->suggests, @@ -681,11 +682,8 @@ void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te) ps = rpmtsProblems(ts); for (i = 0; i < ts->filesystemCount; i++, dsi++) { - /* XXX Avoid FAT and other file systems that have not inodes. */ - if (dsi->iavail <= 0) - continue; - - if (adj_fs_blocks(dsi->bneeded) > dsi->bavail) { + /* XXX Avoid FAT and other file systems that have nvailot inodes. */ + if (dsi->iavail > 0 && adj_fs_blocks(dsi->bneeded) > dsi->bavail) { rpmpsAppend(ps, RPMPROB_DISKSPACE, rpmteNEVR(te), rpmteKey(te), ts->filesystems[i], NULL, NULL, @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -2526,8 +2526,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "balíèek %s (který je novìj¹í, ne¾ %s) je ji¾ nainstalován" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s" #: lib/rpmps.c:260 @@ -2666,7 +2666,7 @@ msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít RPM databázi v %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojených systémù souborù\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -2540,8 +2540,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "pakke %s (som er nyere end %s) er allerede installeret" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet" #: lib/rpmps.c:260 @@ -2682,7 +2682,7 @@ msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -2715,7 +2715,7 @@ msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2858,7 +2858,7 @@ msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -2587,7 +2587,7 @@ msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2726,7 +2726,7 @@ msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2629,7 +2629,7 @@ msgstr "aucun package n'a t spcifi pour l'installation" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2766,7 +2766,7 @@ msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -2457,7 +2457,7 @@ msgstr "" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2594,7 +2594,7 @@ msgid "cannot open Packages database in %s\n" msgstr "" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -2476,7 +2476,7 @@ msgstr "" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2613,7 +2613,7 @@ msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -2631,7 +2631,7 @@ msgstr "" #: lib/rpmps.c:250 #, fuzzy, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" @@ -2774,7 +2774,7 @@ msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -2512,8 +2512,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb(ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" @@ -2658,7 +2658,7 @@ msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -2499,7 +2499,7 @@ msgstr "" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2638,7 +2638,7 @@ msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -2588,7 +2588,7 @@ msgstr "" #: lib/rpmps.c:250 #, fuzzy, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" #: lib/rpmps.c:260 @@ -2727,7 +2727,7 @@ msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" @@ -2527,8 +2527,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "o pacote %s (que é mais recente que o %s) já está instalado" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s" #: lib/rpmps.c:260 @@ -2668,7 +2668,7 @@ msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4a6d34e7d..96af971ee 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" #: build.c:40 #, fuzzy @@ -2733,7 +2733,7 @@ msgstr "no foi passado pacote para instalao" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2877,7 +2877,7 @@ msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -2457,7 +2457,7 @@ msgstr "" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2594,7 +2594,7 @@ msgid "cannot open Packages database in %s\n" msgstr "" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index c6ae35079..32feb3f09 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-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2463,7 +2463,7 @@ msgstr "" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2600,7 +2600,7 @@ msgid "cannot open Packages database in %s\n" msgstr "" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -2526,8 +2526,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" #: lib/rpmps.c:260 @@ -2666,7 +2666,7 @@ msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -2584,7 +2584,7 @@ msgstr "balík %s nie je nain¹talovaný\n" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2723,7 +2723,7 @@ msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.251 2002/06/04 22:02:58 jbj Exp $ +# $Id: sl.po,v 1.252 2002/06/05 20:27:57 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -2587,7 +2587,7 @@ msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen" #: lib/rpmps.c:250 #, fuzzy, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s" #: lib/rpmps.c:260 @@ -2726,7 +2726,7 @@ msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -2578,7 +2578,7 @@ msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" #: lib/rpmps.c:250 #, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" #: lib/rpmps.c:260 @@ -2717,7 +2717,7 @@ msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2002-02-18 21:13+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -2509,8 +2509,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s (som är nyare än %s) är redan installerat" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "installation av paket %s kräver %ld%cB på filsystem %s" #: lib/rpmps.c:260 @@ -2649,7 +2649,7 @@ msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-04 17:50-0400\n" +"POT-Creation-Date: 2002-06-05 16:20-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -2542,8 +2542,8 @@ msgid "package %s (which is newer than %s) is already installed" msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)" #: lib/rpmps.c:250 -#, c-format -msgid "installing package %s needs %ld%cb on the %s filesystem" +#, fuzzy, c-format +msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" #: lib/rpmps.c:260 @@ -2682,7 +2682,7 @@ msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" #. Get available space on mounted file systems. -#: lib/rpmts.c:560 +#: lib/rpmts.c:561 msgid "getting list of mounted filesystems\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" diff --git a/python/header-py.c b/python/header-py.c index e97c075d4..74238c7de 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -82,7 +82,7 @@ /** \ingroup python */ struct hdrObject_s { - PyObject_HEAD; + PyObject_HEAD Header h; char ** md5list; char ** fileList; diff --git a/python/poptmodule.c b/python/poptmodule.c index 4d509e88e..1a69e37ac 100644 --- a/python/poptmodule.c +++ b/python/poptmodule.c @@ -6,7 +6,7 @@ #define PY_POPT_VERSION "0.2" -static const char *rcs_id = "$Id: poptmodule.c,v 1.6 2001/09/15 13:49:38 jbj Exp $"; +static const char *rcs_id = "$Id: poptmodule.c,v 1.7 2002/06/05 20:28:03 jbj Exp $"; static char *module_doc = "Python bindings for the popt library\n\ \n\ @@ -27,7 +27,7 @@ and is always available from ftp://ftp.rpm.org/pub/rpm/dist"; /* Functins and datatypes needed for the context object */ typedef struct poptContext_s { - PyObject_HEAD; + PyObject_HEAD struct poptOption *options; int optionsNo; poptContext ctx; diff --git a/python/rpmdb/dbshelve.py b/python/rpmdb/dbshelve.py index e4ca9335b..410a58606 100644 --- a/python/rpmdb/dbshelve.py +++ b/python/rpmdb/dbshelve.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python #------------------------------------------------------------------------ # Copyright (c) 1997-2001 by Total Control Software # All Rights Reserved diff --git a/rpm.spec.in b/rpm.spec.in index a8f0d9acb..e52bb3617 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -516,10 +516,14 @@ fi %{__prefix}/include/popt.h %changelog -* Tue Jun 4 2002 Jeff Johnson <jbj@redhat.com> +* Wed Jun 5 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.23 +- python: portability fiddles (#54350). +- check inodes (but not blocks) on FAT file systems (#64256). + +* Tue Jun 4 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.22 - use /etc/rpm/platform (if it exists), rather than uname(2), for arch. -* Mon Jun 3 2002 Jeff Johnson <jbj@redhat.com> +* Mon Jun 3 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.21 - python: include rpmdb module, renamed from bsddb3. * Sat Jun 1 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.20 |