RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe
Root: /v/rpm/cvs Email: g...@rpm5.org
Module: rpm Date: 03-Mar-2009 22:29:29
Branch: HEAD Handle: 2009030321292800
Modified files:
rpm CHANGES
rpm/lib transaction.c
rpm/scripts Makefile.am
Log:
- markLinkedFailed if rpm file reopen failed during transaction to
avoid losing old pkg info from db
Summary:
Revision Changes Path
1.2798 +1 -0 rpm/CHANGES
1.394 +3 -0 rpm/lib/transaction.c
1.58 +1 -1 rpm/scripts/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2797 -r1.2798 CHANGES
--- rpm/CHANGES 2 Mar 2009 23:38:34 -0000 1.2797
+++ rpm/CHANGES 3 Mar 2009 21:29:28 -0000 1.2798
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - glen: markLinkedFailed if rpm file reopen failed during transaction to
avoid losing old pkg info from db
- jbj: bzdio: finish abstraction between FD_t <-> rpmbz methods.
- jbj: bzdio: stub-in an abstraction between FD_t <-> rpmbz methods.
- jbj: bzdio: hmm, revert the pop/replace patch, there's more todo++ ...
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.393 -r1.394 transaction.c
--- rpm/lib/transaction.c 29 Dec 2008 22:42:25 -0000 1.393
+++ rpm/lib/transaction.c 3 Mar 2009 21:29:28 -0000 1.394
@@ -1793,6 +1793,9 @@
/*...@innerbreak@*/ break;
}
if (rpmteFd(p) != NULL) gotfd = 1;
+ } else {
+ ourrc++;
+ xx = markLinkedFailed(ts, p);
}
}
/*...@=type@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.57 -r1.58 Makefile.am
--- rpm/scripts/Makefile.am 11 Feb 2009 16:59:29 -0000 1.57
+++ rpm/scripts/Makefile.am 3 Mar 2009 21:29:28 -0000 1.58
@@ -44,7 +44,7 @@
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
- check-files cross-build executabledeps.sh \
+ check-files cross-build executabledeps.sh hrmib-cache \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
find-requires.perl getpo.sh http.req \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
