diff options
| -rw-r--r-- | lib/header.c | 4 | ||||
| -rw-r--r-- | po/cs.po | 4 | ||||
| -rw-r--r-- | po/da.po | 4 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/fi.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/id.po | 4 | ||||
| -rw-r--r-- | po/is.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/ko.po | 4 | ||||
| -rw-r--r-- | po/no.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 4 | ||||
| -rw-r--r-- | po/ro.po | 4 | ||||
| -rw-r--r-- | po/rpm.pot | 4 | ||||
| -rw-r--r-- | po/ru.po | 4 | ||||
| -rw-r--r-- | po/sk.po | 4 | ||||
| -rw-r--r-- | po/sl.po | 6 | ||||
| -rw-r--r-- | po/sr.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 4 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | po/wa.po | 4 | ||||
| -rw-r--r-- | po/zh.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.GB2312.po | 4 | ||||
| -rwxr-xr-x | scripts/trpm | 78 |
31 files changed, 119 insertions, 83 deletions
diff --git a/lib/header.c b/lib/header.c index d9087b2af..c1b295216 100644 --- a/lib/header.c +++ b/lib/header.c @@ -278,13 +278,14 @@ static int regionSwab(struct indexEntry * entry, int il, int dl, ie.info.tag = ntohl(pe->tag); ie.info.type = ntohl(pe->type); - assert(ie.info.type >= RPM_MIN_TYPE && ie.info.type <= RPM_MAX_TYPE); ie.info.count = ntohl(pe->count); ie.info.offset = ntohl(pe->offset); ie.data = t = dataStart + ie.info.offset; ie.length = dataLength(ie.info.type, ie.data, ie.info.count, 1); ie.rdlen = 0; +assert(ie.info.type >= RPM_MIN_TYPE && ie.info.type <= RPM_MAX_TYPE); + if (entry) { ie.info.offset = regionid; *entry = ie; /* structure assignment */ @@ -579,7 +580,6 @@ assert(rdlen == dl); } } - } h->sorted = 0; @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -3014,7 +3014,7 @@ msgstr "balíèek %s není pøemístitelný\n" #: lib/problems.c:116 #, fuzzy, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "soubor %s zpùsobuje konflikt mezi instalovaným %s-%s-%s a %s-%s-%s" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen <kenneth@gnu.org>\n" "Language-Team: Danish/Dansk <dansk@klid.dk>\n" @@ -2974,7 +2974,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -3261,7 +3261,7 @@ msgstr "Paket %s ist nicht installiert\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -3177,7 +3177,7 @@ msgstr "paketti %s ei ole asennettu\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-12-14 17:04-0500\n" +msgstr "POT-Creation-Date: 2000-12-17 14:41-0500\n" #: build.c:26 #, fuzzy, c-format @@ -3182,7 +3182,7 @@ msgstr "aucun package n'a été spécifié pour l'installation" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -2969,7 +2969,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -88,7 +88,7 @@ msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n" # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.125 2000/12/14 22:14:31 jbj Exp $ +# $Id: ja.po,v 1.126 2000/12/17 19:55:32 jbj Exp $ #: rpm.c:185 rpmqv.c:269 #, c-format msgid "rpm: %s\n" @@ -3131,7 +3131,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ¤Þ¤»¤ó" #: lib/problems.c:116 #, fuzzy, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -2989,7 +2989,7 @@ msgstr "pakke %s kan ikke relokeres\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -3117,7 +3117,7 @@ msgstr "pakiet %s nie jest przesuwalny\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais <morais@poli.org>\n" "Language-Team: pt <morais@poli.org>\n" @@ -2939,7 +2939,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 diff --git a/po/pt_BR.po b/po/pt_BR.po index 0b4b5ce38..21cfa1097 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-12-14 17:04-0500\n" +msgstr "POT-Creation-Date: 2000-12-17 14:41-0500\n" # , c-format #: build.c:26 @@ -3254,7 +3254,7 @@ msgstr "não foi passado pacote para instalação" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2937,7 +2937,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 diff --git a/po/rpm.pot b/po/rpm.pot index dae458a92..b49784ea4 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -3030,7 +3030,7 @@ msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n" #: lib/problems.c:116 #, fuzzy, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s-%s-%s É %s-%s-%s" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -3126,7 +3126,7 @@ msgstr "balík %s nie je nain¹talovaný\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -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.110 2000/12/14 22:14:33 jbj Exp $ +# $Id: sl.po,v 1.111 2000/12/17 19:55:49 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -3112,7 +3112,7 @@ msgstr "paketa %s ni mo¾no prestaviti\n" #: lib/problems.c:116 #, fuzzy, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s" #: lib/problems.c:121 @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan <ewt@lacrosse.redhat.com>\n" @@ -3132,7 +3132,7 @@ msgstr "paket %s nije instaliran\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -3004,7 +3004,7 @@ msgstr "paket %s är inte relokerbart\n" #: lib/problems.c:116 #, fuzzy, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "filen %s är en konflikt mellan installationsförsök av %s-%s-%s och %s-%s-%s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -3188,7 +3188,7 @@ msgstr "%s pakedi yüklenmemiþ\n" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 7ec50f415..1b8ab90e2 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-14 17:04-0500\n" +"POT-Creation-Date: 2000-12-17 14:41-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" @@ -2942,7 +2942,7 @@ msgstr "" #: lib/problems.c:116 #, c-format -msgid "file %s conflicts between attemped installs of %s and %s" +msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" #: lib/problems.c:121 diff --git a/scripts/trpm b/scripts/trpm index 71863c452..c3eefec81 100755 --- a/scripts/trpm +++ b/scripts/trpm @@ -2,18 +2,22 @@ dbg= # echo +rpm=/bin/rpm +rpmb=/usr/bin/rpmbuild +rpmq=/usr/bin/rpmquery +rpmdb=/usr/bin/rpmdb + dist=7.0 -type=all -arch=`/bin/rpm --eval '%{_arch}'` +type=min +arch=`$rpm --eval '%{_arch}'` -root=`pwd`/root +top=`pwd` +root=$top/$dist sudo=sudo -rpm="/X/src/rpm401/rpm --root $root" -rpmb=/usr/bin/rpmbuild -rpmdb=/usr/bin/rpmdb justdb="--justdb --noscripts --notriggers --ignoresize" dmopts="-l dmalloc.log -i 100 low" db1= +rc="--rcfile $top/rpmrc-$dist" sorted= # "| sort" minglob=" @@ -123,7 +127,7 @@ m4- perl- tcsh- " - +classes="min min1 min2 base devel build" notallpat="(kernel-[^2h])" for cmd in $* @@ -133,54 +137,86 @@ do debug) dbg=echo ;; dmalloc) eval `dmalloc -b $dmopts` ;; db1) db1="--define '%_dbapi 1'" ;; - 5.2|6.2|7.0|7.1) dist=$cmd ;; + 5.2|6.2|7.0|7.1) + dist=$cmd + root=$top/$dist + rc="--rcfile $top/rpmrc-$dist $db1" + $dbg mkdir -p $root/{X/tmp,X/RPMS,X/SRPMS} || exit 1 + cat << EOF > $top/rpmrc-$dist +include: /usr/lib/rpm/rpmrc +macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:$top/macros:$top/macros-$dist-$arch +EOF + cat << EOF > $top/macros-$dist-$arch +%_topdir $root/X +EOF + ;; + config) + $dbg cat << EOF > $top/macros +%_ntopdir %{_topdir}/%{name}-%{version}-%{release} +%_builddir %{_ntopdir} +%_sourcedir %{_ntopdir} +%_specdir %{_ntopdir} +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm +%_rpmdir %{_topdir}/RPMS +%_srcrpmdir %{_topdir}/SRPMS +%_tmppath %{_topdir}/tmp +EOF + ;; manifest) rm -f *-$dist-$arch pkgs="/$dist/$arch" ls -1 ${pkgs}/*.rpm | egrep "(noarch|$arch).rpm" > list-$dist-$arch cat list-$dist-$arch | egrep -v $notallpat > all-$dist-$arch - for l in min min1 min2 base devel build - do + $dbg $rpmq $rc -qp --qf "/$dist/SRPMS/%{sourcerpm}\\n" \ +`cat all-$dist-$arch` | sort | uniq > all-$dist-$arch-srpms + for l in $classes ; do glv='$'${l}glob glist="`eval echo $glv`" for g in $glist ; do ls -1 ${pkgs}/${g}*.rpm 2> /dev/null done | egrep "(noarch|$arch).rpm" $sorted > $l-$dist-$arch + $dbg $rpmq $rc -qp --qf "/$dist/SRPMS/%{sourcerpm}\\n" \ +`cat $l-$dist-$arch` | sort | uniq > $l-$dist-$arch-srpms + done + ;; + clean) + $dbg $sudo mv $root ${root}-$$ && $dbg $sudo rm -rf ${root}-$$ + ;; + --rebuild) + for srpm in `cat $type-$dist-$arch-srpms` ; do + $dbg $rpmb $rc $cmd $srpm done ;; --initdb) - [ -d $root ] && \ - $dbg $sudo mv $root ${root}-$$ && \ - $dbg $sudo rm -rf ${root}-$$ & - sleep 2 $dbg $sudo mkdir -p $root/var/lib/rpm - $dbg $sudo $rpm $db1 --initdb + $dbg $sudo $rpmdb $rc --root $root --initdb ;; --savedb) ( $dbg cd $root/var/lib && $dbg $sudo tar czvf rpmdb.tar.gz rpm ; ) ;; --rebuilddb) - $dbg $sudo $rpm --rebuilddb -vv + $dbg $sudo $rpmdb $rc --root $root --rebuilddb -vv ;; --justdb) [ -f $type-$dist-$arch ] || { echo $type-$dist-$arch not found exit 1 } - $dbg $sudo $rpm $db1 -Uv $justdb `cat $type-$dist-$arch` + $dbg $sudo $rpm $rc --root $root -Uv $justdb `cat $type-$dist-$arch` ;; -U*|-F*) [ -f $type-$dist-$arch ] || { echo $type-$dist-$arch not found exit 1 } - $dbg $sudo $rpm $db1 $cmd `cat $type-$dist-$arch` + $dbg $sudo $rpm $rc --root $root $cmd `cat $type-$dist-$arch` ;; - -[Vqei]*) - $dbg $sudo $rpm $cmd + -[Vqei]*|--showrc) + $dbg $sudo $rpm $rc --root $root $cmd ;; chroot) - $dbg $sudo cp /etc/resolv.conf $root/etc + $dbg $sudo touch $root/etc/mtab + $dbg $sudo cp /etc/resolv.conf /etc/fstab $root/etc $dbg $sudo env HOME=/root chroot $root ;; *) type=$cmd ;; |