diff options
author | jbj <devnull@localhost> | 2002-07-06 18:48:09 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2002-07-06 18:48:09 +0000 |
commit | a273ea6a095daa16e663d96e474c75115c3c2bdc (patch) | |
tree | f89406a1fa5dd865610cf5a4a646ddbc198162f9 | |
parent | 68b42bb762d650fe68d4bcc8827051e08a69201c (diff) | |
download | librpm-tizen-a273ea6a095daa16e663d96e474c75115c3c2bdc.tar.gz librpm-tizen-a273ea6a095daa16e663d96e474c75115c3c2bdc.tar.bz2 librpm-tizen-a273ea6a095daa16e663d96e474c75115c3c2bdc.zip |
- fix: permit deletions of added packages (#67108).
CVS patchset: 5541
CVS date: 2002/07/06 18:48:09
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | doc/rpmcache.8 | 2 | ||||
-rw-r--r-- | lib/depends.c | 18 | ||||
-rw-r--r-- | lib/rpmal.c | 4 | ||||
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/da.po | 2 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/en_RN.po | 2 | ||||
-rw-r--r-- | po/es.po | 2 | ||||
-rw-r--r-- | po/eu_ES.po | 2 | ||||
-rw-r--r-- | po/fi.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/gl.po | 2 | ||||
-rw-r--r-- | po/hu.po | 2 | ||||
-rw-r--r-- | po/id.po | 2 | ||||
-rw-r--r-- | po/is.po | 2 | ||||
-rw-r--r-- | po/it.po | 2 | ||||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/no.po | 2 | ||||
-rw-r--r-- | po/pl.po | 2 | ||||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/pt_BR.po | 2 | ||||
-rw-r--r-- | po/ro.po | 2 | ||||
-rw-r--r-- | po/rpm.pot | 2 | ||||
-rw-r--r-- | po/ru.po | 2 | ||||
-rw-r--r-- | po/sk.po | 2 | ||||
-rw-r--r-- | po/sl.po | 4 | ||||
-rw-r--r-- | po/sr.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/tr.po | 2 | ||||
-rw-r--r-- | po/uk.po | 2 | ||||
-rw-r--r-- | po/wa.po | 2 | ||||
-rw-r--r-- | po/zh.po | 2 | ||||
-rw-r--r-- | po/zh_CN.GB2312.po | 2 | ||||
-rw-r--r-- | rpm.spec.in | 7 |
36 files changed, 50 insertions, 46 deletions
@@ -160,6 +160,7 @@ - proof-of-concept rpmcache functionality. - fix: do lazy open of database in rpmtsInitDB() (#67994). - update rpmcache.8. + - fix: permit deletions of added packages (#67108). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/doc/rpmcache.8 b/doc/rpmcache.8 index 062c0f821..a705e40ba 100644 --- a/doc/rpmcache.8 +++ b/doc/rpmcache.8 @@ -22,7 +22,7 @@ package epoch/version/release for identical package names and using the build time as a tie breaker) package headers, if they are unique, are cached in an rpm database. The rpm database cache can be used to provide suggested -paths to packages that resolve unknow dependencies. +paths to packages that resolve unknown dependencies. .PP There are no \fBrpmcache\fR specific options, only common \fBrpm\fR options. See the \fBrpmcache\fR usage message for what is currently implemented. diff --git a/lib/depends.c b/lib/depends.c index fc5ac4027..4f3a9f10c 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -177,15 +177,6 @@ int rpmtsAddInstallElement(rpmts ts, Header h, isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE); - if (p != NULL && duplicate && oc < ts->orderCount) { - /* XXX FIXME removed transaction element side effects need to be weeded */ -/*@-type -unqualifiedtrans@*/ -/*@-boundswrite@*/ - ts->order[oc] = rpmteFree(ts->order[oc]); -/*@=boundswrite@*/ -/*@=type =unqualifiedtrans@*/ - } - if (oc >= ts->orderAlloced) { ts->orderAlloced += (oc - ts->orderAlloced) + ts->delta; /*@-type +voidabstract @*/ @@ -194,6 +185,15 @@ int rpmtsAddInstallElement(rpmts ts, Header h, } p = rpmteNew(ts, h, TR_ADDED, key, relocs, -1, pkgKey); + + if (duplicate && oc < ts->orderCount) { +/*@-type -unqualifiedtrans@*/ +/*@-boundswrite@*/ + ts->order[oc] = rpmteFree(ts->order[oc]); +/*@=boundswrite@*/ +/*@=type =unqualifiedtrans@*/ + } + /*@-boundswrite@*/ ts->order[oc] = p; /*@=boundswrite@*/ diff --git a/lib/rpmal.c b/lib/rpmal.c index 4822fc41c..0b5667f2a 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -342,7 +342,7 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum); if (i > die->numFiles) /*@innercontinue@*/ continue; /*@-bounds@*/ - memmove(fie, fie+1, (die->numFiles - i)); + memmove(fie, fie+1, (die->numFiles - i) * sizeof(*fie)); /*@=bounds@*/ } if (die->numFiles > 0) { @@ -357,7 +357,7 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum); if ((die - al->dirs) > al->numDirs) continue; /*@-bounds@*/ - memmove(die, die+1, (al->numDirs - (die - al->dirs))); + memmove(die, die+1, (al->numDirs - (die - al->dirs)) * sizeof(*die)); /*@=bounds@*/ } @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/po/en_RN.po b/po/en_RN.po index 77e876c2d..a92172a05 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/po/eu_ES.po b/po/eu_ES.po index 77e876c2d..a92172a05 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2bf98b4f2..8d83c9208 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-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-0400\n" #: build.c:40 #, fuzzy @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/po/rpm.pot b/po/rpm.pot index 21ebe5827..6a6cbb80f 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-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -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.272 2002/07/05 16:52:32 jbj Exp $ +# $Id: sl.po,v 1.273 2002/07/06 18:48:29 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 77e876c2d..a92172a05 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.3\n" -"POT-Creation-Date: 2002-07-05 10:31-0400\n" +"POT-Creation-Date: 2002-07-06 14:48-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" diff --git a/rpm.spec.in b/rpm.spec.in index ef4dd31c3..c71ae4e51 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -17,7 +17,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.42 +Release: 0.43 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -514,7 +514,10 @@ fi %{__prefix}/include/popt.h %changelog -* Fri Jul 5 2002 Jeff Johnson <jbj@redhat.com> +* Sat Jul 6 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.43 +- fix: permit deletions of added packages (#67108). + +* Fri Jul 5 2002 Jeff Johnson <jbj@redhat.com> 4,1-0.42 - fix: do lazy open of database in rpmtsInitDB() (#67994). - update rpmcache.8. |