- python: permit stdout/stderr to be remapped to install.log.
CVS patchset: 6031
CVS date: 2003/01/28 17:17:26
- fix: debugedit.c problem.
- permit anaconda to choose "presentation order".
- fix: more debugedit.c problems.
+ - fix: clean relocation path for --prefix=/.
+ - python: permit stdout/stderr to be remapped to install.log.
4.0.4 -> 4.1:
- loosely wire beecrypt library into rpm.
if (relocations[j].newPath) { /* Relocate the path */
const char * s = relocations[j].newPath;
char * t = alloca(strlen(s) + strlen(dirNames[i]) - len + 1);
+ size_t slen;
(void) stpcpy( stpcpy(t, s) , dirNames[i] + len);
+
+ /* Unfortunatly rpmCleanPath strips the trailing slash.. */
+ (void) rpmCleanPath(t);
+ slen = strlen(t);
+ t[slen] = '/';
+ t[slen+1] = '\0';
+
if (actions)
rpmMessage(RPMMESS_DEBUG,
_("relocating directory %s to %s\n"), dirNames[i], t);
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "Provádìní(%s): %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
msgstr "(chyba: 0x%x)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
#, fuzzy
msgid "fatal error: "
msgstr "Interní chyba"
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
#, fuzzy
msgid "error: "
msgstr "(chyba: 0x%x)"
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "omrokerer %s til %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "omrokerer kataloget %s til %s\n"
msgstr "(ingen fejl)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "fatal fejl: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "fejl: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "advarsel: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
msgstr "Fehler: "
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "Fataler Fehler: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "Fehler: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "Warnung: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\n"
"PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
msgid "relocating %s to %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
msgstr "virhe: "
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "vakava virhe: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "virhe: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "varoitus: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "impossible d'ouvrir: %s\n"
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr ""
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr ""
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr ""
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr ""
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "%5d færa %s -> %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "%5d færa %s -> %s\n"
msgstr "(engin villa)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "banvæn villa: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "villa: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "aðvörun: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
msgstr "(¥¨¥é¡¼ 0x%x)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "¥¨¥é¡¼: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "·Ù¹ð: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "%s(À»)¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "%s µð·ºÅ丮¸¦ %s(À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
msgstr "(¿À·ù ¾øÀ½)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "Ä¡¸íÀû ¿À·ù: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "¿À·ù: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "°æ°í: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "relokerer %s til %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "relokerer katalog %s til %s\n"
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "fatal feil: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "feil: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "advarsel: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "przesuwanie %s do %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "przesuwanie %s do %s\n"
msgstr "(b³±d 0x%x)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "fatalny b³±d: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "b³±d: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "ostrze¿enie: "
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "a mudar o %s para %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "a mudar a directoria %s para %s\n"
msgstr "(nenhum erro)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "erro fatal: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "erro: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "aviso: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "No consegui abrir: %s\n"
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr ""
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr ""
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr ""
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr ""
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr ""
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr ""
msgstr ""
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr ""
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr ""
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\n"
"PO-Revision-Date: 2002-08-27 13:36-0400\n"
"Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
msgid "relocating %s to %s\n"
msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
msgstr "(ÎÅÔ ÏÛÉÂËÉ)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "ÏÛÉÂËÁ: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "presúva sa %s do %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "presúva sa %s do %s\n"
msgstr "(chyba 0x%x)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "fatálna chyba: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "chyba: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "varovanie: "
# -*- 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.369 2003/01/27 17:46:37 jbj Exp $
+# $Id: sl.po,v 1.370 2003/01/28 17:18:01 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "premikanje %s v %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "premiokanje imenika %s v %s\n"
msgstr "(napaka 0x%x)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "usodna napaka: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "napaka: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "opozorilo: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "relocating %s to %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, fuzzy, c-format
msgid "relocating directory %s to %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
msgstr "gre¹ka: "
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "fatalna gre¹ka: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "gre¹ka: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "upozorenje: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.2\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\n"
"PO-Revision-Date: 2003-01-27 17:43+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
msgid "relocating %s to %s\n"
msgstr "flyttar %s till %s\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "flyttar katalogen %s till %s\n"
msgstr "(inget fel)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "ödesdigert fel: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "fel: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "varning: "
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2003-01-27 12:37-0500\n"
+"POT-Creation-Date: 2003-01-28 12:11-0500\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"
msgid "relocating %s to %s\n"
msgstr "%s %s'e konumlanýyor\n"
-#: lib/rpmfi.c:877
+#: lib/rpmfi.c:885
#, c-format
msgid "relocating directory %s to %s\n"
msgstr "%s dizini %s de yeniden konumlanýyor\n"
msgstr "(hata yok)"
#. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:130 rpmio/rpmlog.c:131 rpmio/rpmlog.c:132
+#: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
msgid "fatal error: "
msgstr "ölümcül hata: "
#. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:133
+#: rpmio/rpmlog.c:145
msgid "error: "
msgstr "hata: "
#. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:134
+#: rpmio/rpmlog.c:146
msgid "warning: "
msgstr "uyarý: "
return Py_BuildValue("i", score);
}
-#ifdef DYING
/**
*/
-static int psGetArchScore(Header h)
+static PyObject * setLogFile (PyObject * self, PyObject * args)
{
- void * pkgArch;
- int type, count;
-
- if (!headerGetEntry(h, RPMTAG_ARCH, &type, (void **) &pkgArch, &count) ||
- type == RPM_INT8_TYPE)
- return 150;
- else
- return rpmMachineScore(RPM_MACHTABLE_INSTARCH, pkgArch);
-}
-
-/**
- */
-static int pkgCompareVer(void * first, void * second)
-{
- struct packageInfo ** a = first;
- struct packageInfo ** b = second;
- int ret, score1, score2;
-
- /* put packages w/o names at the end */
- if (!(*a)->name) return 1;
- if (!(*b)->name) return -1;
-
- ret = xstrcasecmp((*a)->name, (*b)->name);
- if (ret) return ret;
- score1 = psGetArchScore((*a)->h);
- if (!score1) return 1;
- score2 = psGetArchScore((*b)->h);
- if (!score2) return -1;
- if (score1 < score2) return -1;
- if (score1 > score2) return 1;
- return rpmVersionCompare((*b)->h, (*a)->h);
-}
-
-/**
- */
-static void pkgSort(struct pkgSet * psp)
-{
- int i;
- char *name;
+ PyObject * fop = NULL;
+ FILE * fp = NULL;
- if (psp->numPackages <= 0)
- return;
-
- qsort(psp->packages, psp->numPackages, sizeof(*psp->packages),
- (void *) pkgCompareVer);
-
- name = psp->packages[0]->name;
- if (!name) {
- psp->numPackages = 0;
- return;
- }
- for (i = 1; i < psp->numPackages; i++) {
- if (!psp->packages[i]->name) break;
- if (!strcmp(psp->packages[i]->name, name))
- psp->packages[i]->name = NULL;
- else
- name = psp->packages[i]->name;
- }
-
- qsort(psp->packages, psp->numPackages, sizeof(*psp->packages),
- (void *) pkgCompareVer);
-
- for (i = 0; i < psp->numPackages; i++)
- if (!psp->packages[i]->name) break;
- psp->numPackages = i;
-}
-
-/**
- */
-static PyObject * findUpgradeSet(PyObject * self, PyObject * args)
-{
- PyObject * hdrList, * result;
- char * root = "/";
- int i;
- struct pkgSet list;
- hdrObject * hdr;
-
- if (!PyArg_ParseTuple(args, "O|s", &hdrList, &root)) return NULL;
-
- if (!PyList_Check(hdrList)) {
- PyErr_SetString(PyExc_TypeError, "list of headers expected");
+ if (!PyArg_ParseTuple(args, "|O:logSetFile", &fop))
return NULL;
- }
- list.numPackages = PyList_Size(hdrList);
- list.packages = alloca(sizeof(list.packages) * list.numPackages);
- for (i = 0; i < list.numPackages; i++) {
- hdr = (hdrObject *) PyList_GetItem(hdrList, i);
- if (((PyObject *) hdr)->ob_type != &hdr_Type) {
- PyErr_SetString(PyExc_TypeError, "list of headers expected");
+ if (fop) {
+ if (!PyFile_Check(fop)) {
+ PyErr_SetString(pyrpmError, "requires file object");
return NULL;
}
- list.packages[i] = alloca(sizeof(struct packageInfo));
- list.packages[i]->h = hdrGetHeader(hdr);
- list.packages[i]->selected = 0;
- list.packages[i]->data = hdr;
-
- headerGetEntry(list.packages[i]->h, RPMTAG_NAME, NULL,
- (void **) &list.packages[i]->name, NULL);
- }
-
- pkgSort (&list);
-
- if (ugFindUpgradePackages(&list, root)) {
- PyErr_SetString(pyrpmError, "error during upgrade check");
- return NULL;
- }
-
- result = PyList_New(0);
- for (i = 0; i < list.numPackages; i++) {
- if (list.packages[i]->selected) {
- PyList_Append(result, list.packages[i]->data);
-/* Py_DECREF(list.packages[i]->data); */
- }
+ fp = PyFile_AsFile(fop);
}
- return result;
-}
-#endif
-
-/**
- */
-static PyObject * errorCB = NULL;
-static PyObject * errorData = NULL;
-static PyThreadState * errorThread = NULL;
+ (void) rpmlogSetFile(fp);
-/**
- */
-static void errorcb (void)
-{
- PyObject * result, * args = NULL;
-
- PyEval_RestoreThread(errorThread);
-
- if (errorData)
- args = Py_BuildValue("(O)", errorData);
-
- result = PyEval_CallObject(errorCB, args);
- Py_XDECREF(args);
-
- if (result == NULL) {
- PyErr_Print();
- PyErr_Clear();
- }
-
- errorThread = PyEval_SaveThread();
-
- Py_DECREF (result);
-}
-
-/**
- */
-static PyObject * errorSetCallback (PyObject * self, PyObject * args)
-{
- PyObject *newCB = NULL, *newData = NULL;
-
- if (!PyArg_ParseTuple(args, "O|O", &newCB, &newData)) return NULL;
-
- /* if we're getting a void*, set the error callback to this. */
- /* also, we can possibly decref any python callbacks we had */
- /* and set them to NULL. */
- if (PyCObject_Check (newCB)) {
- rpmErrorSetCallback (PyCObject_AsVoidPtr(newCB));
-
- Py_XDECREF (errorCB);
- Py_XDECREF (errorData);
-
- errorCB = NULL;
- errorData = NULL;
-
- Py_INCREF(Py_None);
- return Py_None;
- }
-
- if (!PyCallable_Check (newCB)) {
- PyErr_SetString(PyExc_TypeError, "parameter must be callable");
- return NULL;
- }
-
- Py_XDECREF(errorCB);
- Py_XDECREF(errorData);
-
- errorCB = newCB;
- errorData = newData;
- errorThread = PyEval_SaveThread();
-
- Py_INCREF (errorCB);
- Py_XINCREF (errorData);
-
- return PyCObject_FromVoidPtr(rpmErrorSetCallback (errorcb), NULL);
-}
-
-/**
- */
-static PyObject * errorString (PyObject * self, PyObject * args)
-{
- return PyString_FromString(rpmErrorString ());
+ Py_INCREF(Py_None);
+ return (PyObject *) Py_None;
}
/**
{ "archscore", (PyCFunction) archScore, METH_VARARGS,
NULL },
-#ifdef DYING
- { "findUpgradeSet", (PyCFunction) findUpgradeSet, METH_VARARGS,
- NULL },
-#endif
+
{ "headerLoad", (PyCFunction) hdrLoad, METH_VARARGS,
NULL },
{ "rhnLoad", (PyCFunction) rhnLoad, METH_VARARGS,
NULL },
{ "readHeaderListFromFile", (PyCFunction) rpmHeaderFromFile, METH_VARARGS,
NULL },
- { "errorSetCallback", (PyCFunction) errorSetCallback, METH_VARARGS,
- NULL },
- { "errorString", (PyCFunction) errorString, METH_VARARGS,
+
+ { "setLogFile", (PyCFunction) setLogFile, METH_VARARGS,
NULL },
+
{ "versionCompare", (PyCFunction) versionCompare, METH_VARARGS,
NULL },
{ "labelCompare", (PyCFunction) labelCompare, METH_VARARGS,
NULL },
{ "setEpochPromote", (PyCFunction) setEpochPromote, METH_VARARGS,
NULL },
+
{ "dsSingle", (PyCFunction) rpmds_Single, METH_VARARGS,
"rpm.dsSingle(TagN, N, [EVR, [Flags]] -> ds\n\
- Create a single element dependency set.\n" },
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
-Release: 0.62
+Release: 0.63
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
%{__includedir}/popt.h
%changelog
-* Mon Jan 27 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.67
+* Tue Jan 28 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.63
+- fix: clean relocation path for --prefix=/.
+- python: permit stdout/stderr to be remapped to install.log.
+
+* Mon Jan 27 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.62
- fix: more debugedit.c problems.
* Sat Jan 25 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.61
return ocb;
}
+/*@unchecked@*/ /*@null@*/
+static FILE * _stdlog = NULL;
+
+FILE * rpmlogSetFile(FILE * fp)
+ /*@globals _stdlog @*/
+ /*@modifies _stdlog @*/
+{
+ FILE * ofp = _stdlog;
+ _stdlog = fp;
+ return ofp;
+}
+
/*@-readonlytrans@*/ /* FIX: double indirection. */
/*@observer@*/ /*@unchecked@*/
static char *rpmlogMsgPrefix[] = {
/*@unused@*/ unsigned fac = RPMLOG_FAC(code);
char *msgbuf, *msg;
int msgnb = BUFSIZ, nb;
- FILE * msgout = stderr;
+ FILE * msgout = (_stdlog ? _stdlog : stderr);
if ((mask & rpmlogMask) == 0)
return;
switch (pri) {
case RPMLOG_INFO:
case RPMLOG_NOTICE:
- msgout = stdout;
+ msgout = (_stdlog ? _stdlog : stdout);
break;
case RPMLOG_EMERG:
#ifdef RPMLOG_NAMES
-CODE facilitynames[] =
+RPMCODE facilitynames[] =
{
{ "auth", RPMLOG_AUTH },
{ "authpriv",RPMLOG_AUTHPRIV },
*/
typedef /*@abstract@*/ struct rpmlogRec_s {
int code;
-/*@owned@*/ /*@null@*/ const char * message;
+/*@owned@*/ /*@null@*/
+ const char * message;
} * rpmlogRec;
#ifdef __cplusplus
/**
* Set the log mask level.
+ * @param mask log mask (0 is no operation)
+ * @return previous log mask
*/
int rpmlogSetMask (int mask)
/*@globals internalState@*/
* @return text of last message
*/
/*@-redecl@*/
-/*@observer@*/ /*@null@*/ const char * rpmlogMessage(void) /*@*/;
+/*@observer@*/ /*@null@*/ const char * rpmlogMessage(void)
+ /*@*/;
/*@=redecl@*/
/**
* and parsed IMHO.
* @return code from last message
*/
-int rpmlogCode(void) /*@*/;
+int rpmlogCode(void)
+ /*@*/;
/**
* Set rpmlog callback function.
+ * @param cb rpmlog callback function
+ * @return previous rpmlog callback function
*/
rpmlogCallback rpmlogSetCallback(rpmlogCallback cb)
/*@globals internalState@*/
/*@modifies internalState @*/;
+
+/**
+ * Set rpmlog file handle.
+ * @param fp rpmlog file handle (NULL uses stdout/stderr)
+ * @return previous rpmlog file handle
+ */
+/*@null@*/
+FILE * rpmlogSetFile(/*@null@*/ FILE * fp)
+ /*@globals internalState@*/
+ /*@modifies internalState @*/;
/*@=exportlocal@*/
/**
* @deprecated Perl-RPM needs, use rpmlogCode() instead.
* @return code from last message
*/
-extern int rpmErrorCode(void) /*@*/;
+extern int rpmErrorCode(void)
+ /*@*/;
/**
* Return text of last rpmError() message.
case MODE_ERASE:
#endif
case MODE_UNKNOWN:
- if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose())
+ if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose()) {
printUsage(optCon, stdout, 0);
- ec = argc;
+ ec = argc;
+ }
break;
}