From c63f257a7ebd1d41a3caf38172251bdb2e6c0b20 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 28 Jan 2003 17:17:26 +0000 Subject: [PATCH] - fix: clean relocation path for --prefix=/. - python: permit stdout/stderr to be remapped to install.log. CVS patchset: 6031 CVS date: 2003/01/28 17:17:26 --- CHANGES | 2 + lib/rpmfi.c | 8 ++ po/cs.po | 10 +-- po/da.po | 10 +-- po/de.po | 10 +-- po/fi.po | 10 +-- po/fr.po | 10 +-- po/gl.po | 10 +-- po/is.po | 10 +-- po/ja.po | 10 +-- po/ko.po | 10 +-- po/no.po | 10 +-- po/pl.po | 10 +-- po/pt.po | 10 +-- po/pt_BR.po | 10 +-- po/ro.po | 10 +-- po/rpm.pot | 10 +-- po/ru.po | 10 +-- po/sk.po | 10 +-- po/sl.po | 12 +-- po/sr.po | 10 +-- po/sv.po | 10 +-- po/tr.po | 10 +-- python/rpmmodule.c | 214 ++++------------------------------------------------- rpm.spec.in | 8 +- rpmio/rpmlog.c | 16 +++- rpmio/rpmlog.h | 28 +++++-- rpmqv.c | 5 +- 28 files changed, 178 insertions(+), 315 deletions(-) diff --git a/CHANGES b/CHANGES index bb824ea..7a15793 100644 --- a/CHANGES +++ b/CHANGES @@ -114,6 +114,8 @@ - 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. diff --git a/lib/rpmfi.c b/lib/rpmfi.c index f7d7e25..d6e6309 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -870,8 +870,16 @@ assert(p != NULL); 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); diff --git a/po/cs.po b/po/cs.po index 39b971f..7a54f8d 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: 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 \n" "Language-Team: Czech \n" @@ -2548,7 +2548,7 @@ msgstr "Prov 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" @@ -3644,19 +3644,19 @@ msgid "(no error)" 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 "" diff --git a/po/da.po b/po/da.po index a0630de..cf1a72f 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: 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 \n" "Language-Team: Danish \n" @@ -2560,7 +2560,7 @@ msgstr "ekskluderer %s %s\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" @@ -3656,17 +3656,17 @@ msgid "(no error)" 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: " diff --git a/po/de.po b/po/de.po index 35eac41..afc48ff 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: 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 \n" "Language-Team: German \n" @@ -2727,7 +2727,7 @@ msgstr "Hole %s heraus\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" @@ -3849,17 +3849,17 @@ msgid "(no error)" 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: " diff --git a/po/fi.po b/po/fi.po index 00de6c0..12fb4d4 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: 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 \n" "Language-Team: Finnish \n" @@ -2603,7 +2603,7 @@ msgstr "Haen: %s\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" @@ -3706,17 +3706,17 @@ msgid "(no error)" 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: " diff --git a/po/fr.po b/po/fr.po index d153403..da96cb6 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: 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 \n" "Language-Team: LANGUAGE \n" @@ -2643,7 +2643,7 @@ msgstr "impossible d'ouvrir: %s\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" @@ -3733,17 +3733,17 @@ msgid "(no error)" 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 "" diff --git a/po/gl.po b/po/gl.po index d3fcf65..27d4d36 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: 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 \n" "Language-Team: Galician \n" @@ -2465,7 +2465,7 @@ msgstr "" 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 "" @@ -3540,17 +3540,17 @@ msgid "(no error)" 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 "" diff --git a/po/is.po b/po/is.po index 0612f2e..77b364e 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: 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 \n" "Language-Team: is \n" @@ -2493,7 +2493,7 @@ msgstr "l 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" @@ -3571,17 +3571,17 @@ msgid "(no error)" 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: " diff --git a/po/ja.po b/po/ja.po index e6e5718..7229ed6 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: 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 \n" "Language-Team: JRPM \n" @@ -2642,7 +2642,7 @@ msgstr " 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" @@ -3757,17 +3757,17 @@ msgid "(no error)" 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 "·Ù¹ð: " diff --git a/po/ko.po b/po/ko.po index 8409919..3bdf909 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: 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 \n" "Language-Team: GNU Translation project \n" @@ -2535,7 +2535,7 @@ msgstr "%s %s( 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" @@ -3635,17 +3635,17 @@ msgid "(no error)" 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 "°æ°í: " diff --git a/po/no.po b/po/no.po index 22c79b1..62a06eb 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: 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 \n" "Language-Team: Norwegian \n" @@ -2520,7 +2520,7 @@ msgstr "eksluderer %s %s\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" @@ -3604,17 +3604,17 @@ msgid "(no error)" 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: " diff --git a/po/pl.po b/po/pl.po index 7ed9f0f..fa6e86b 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: 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 \n" "Language-Team: Polish \n" @@ -2603,7 +2603,7 @@ msgstr "wy 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" @@ -3702,17 +3702,17 @@ msgid "(no error)" 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: " diff --git a/po/pt.po b/po/pt.po index 10ea0ad..88b7c8f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ 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 \n" "Language-Team: pt \n" "Language-Team: Romanian \n" @@ -2465,7 +2465,7 @@ msgstr "" 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 "" @@ -3540,17 +3540,17 @@ msgid "(no error)" 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 "" diff --git a/po/rpm.pot b/po/rpm.pot index c9c1f52..af23429 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ 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 \n" "Language-Team: LANGUAGE \n" @@ -2471,7 +2471,7 @@ msgstr "" 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 "" @@ -3546,17 +3546,17 @@ msgid "(no error)" 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 "" diff --git a/po/ru.po b/po/ru.po index 4435da4..2072b66 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: 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, \n" "Language-Team: Black Cat Linux Team \n" @@ -2516,7 +2516,7 @@ msgstr " 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" @@ -3600,17 +3600,17 @@ msgid "(no error)" 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 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " diff --git a/po/sk.po b/po/sk.po index 9cec33a..1871fb4 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: 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 \n" "Language-Team: Slovak \n" @@ -2601,7 +2601,7 @@ msgstr "vynech 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" @@ -3698,17 +3698,17 @@ msgid "(no error)" 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: " diff --git a/po/sl.po b/po/sl.po index a696677..61679ae 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.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 \n" "Language-Team: Slovenian \n" @@ -2603,7 +2603,7 @@ msgstr "izklju 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" @@ -3706,17 +3706,17 @@ msgid "(no error)" 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: " diff --git a/po/sr.po b/po/sr.po index c3cd294..0371e0b 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: 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" @@ -2594,7 +2594,7 @@ msgstr "Pribavljam %s\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" @@ -3697,17 +3697,17 @@ msgid "(no error)" 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: " diff --git a/po/sv.po b/po/sv.po index ddc62bf..0ecfd7b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ 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 \n" "Language-Team: Swedish \n" @@ -2499,7 +2499,7 @@ msgstr "hoppar 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" @@ -3577,17 +3577,17 @@ msgid "(no error)" 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: " diff --git a/po/tr.po b/po/tr.po index 0d77d87..73ee192 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: 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 \n" "Language-Team: Turkish \n" @@ -2564,7 +2564,7 @@ msgstr "%s %s d 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" @@ -3652,17 +3652,17 @@ msgid "(no error)" 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ý: " diff --git a/python/rpmmodule.c b/python/rpmmodule.c index adcf3f5..9a742ce 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -57,208 +57,28 @@ static PyObject * archScore(PyObject * self, PyObject * args) 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; } /** @@ -304,10 +124,7 @@ static PyMethodDef rpmModuleMethods[] = { { "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, @@ -318,10 +135,10 @@ static PyMethodDef rpmModuleMethods[] = { 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, @@ -330,6 +147,7 @@ static PyMethodDef rpmModuleMethods[] = { 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" }, diff --git a/rpm.spec.in b/rpm.spec.in index a2a4029..7731a43 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -20,7 +20,7 @@ Name: rpm %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 @@ -470,7 +470,11 @@ exit 0 %{__includedir}/popt.h %changelog -* Mon Jan 27 2003 Jeff Johnson 4.2-0.67 +* Tue Jan 28 2003 Jeff Johnson 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 4.2-0.62 - fix: more debugedit.c problems. * Sat Jan 25 2003 Jeff Johnson 4.2-0.61 diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 13abea8..4d8e8d9 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -124,6 +124,18 @@ rpmlogCallback rpmlogSetCallback(rpmlogCallback cb) 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[] = { @@ -158,7 +170,7 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) /*@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; @@ -216,7 +228,7 @@ static void vrpmlog (unsigned code, const char *fmt, va_list ap) switch (pri) { case RPMLOG_INFO: case RPMLOG_NOTICE: - msgout = stdout; + msgout = (_stdlog ? _stdlog : stdout); break; case RPMLOG_EMERG: diff --git a/rpmio/rpmlog.h b/rpmio/rpmlog.h index 3a5460c..6cbd01b 100644 --- a/rpmio/rpmlog.h +++ b/rpmio/rpmlog.h @@ -102,7 +102,7 @@ typedef enum rpmlogFac_e { #ifdef RPMLOG_NAMES -CODE facilitynames[] = +RPMCODE facilitynames[] = { { "auth", RPMLOG_AUTH }, { "authpriv",RPMLOG_AUTHPRIV }, @@ -158,7 +158,8 @@ typedef void (*rpmlogCallback) (void); */ typedef /*@abstract@*/ struct rpmlogRec_s { int code; -/*@owned@*/ /*@null@*/ const char * message; +/*@owned@*/ /*@null@*/ + const char * message; } * rpmlogRec; #ifdef __cplusplus @@ -198,6 +199,8 @@ void rpmlogOpen (const char * ident, int option, int facility) /** * Set the log mask level. + * @param mask log mask (0 is no operation) + * @return previous log mask */ int rpmlogSetMask (int mask) /*@globals internalState@*/ @@ -215,7 +218,8 @@ int rpmlogSetMask (int mask) * @return text of last message */ /*@-redecl@*/ -/*@observer@*/ /*@null@*/ const char * rpmlogMessage(void) /*@*/; +/*@observer@*/ /*@null@*/ const char * rpmlogMessage(void) + /*@*/; /*@=redecl@*/ /** @@ -225,14 +229,27 @@ int rpmlogSetMask (int mask) * 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@*/ /** @@ -248,7 +265,8 @@ extern rpmlogCallback rpmErrorSetCallback(rpmlogCallback cb) * @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. diff --git a/rpmqv.c b/rpmqv.c index c557d96..48ec477 100755 --- a/rpmqv.c +++ b/rpmqv.c @@ -847,9 +847,10 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE; 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; } -- 2.7.4