RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 31-Mar-2010 14:26:21
Branch: HEAD Handle: 2010033112262001
Modified files:
rpm CHANGES
rpm/rpmio rpmio.c
Log:
- nix: avoid deadlock, live with a leak, for rpmnix object. todo++.
Summary:
Revision Changes Path
1.3292 +1 -0 rpm/CHANGES
1.218 +2 -0 rpm/rpmio/rpmio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3291 -r1.3292 CHANGES
--- rpm/CHANGES 31 Mar 2010 12:22:05 -0000 1.3291
+++ rpm/CHANGES 31 Mar 2010 12:26:20 -0000 1.3292
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: nix: avoid deadlock, live with a leak, for rpmnix object. todo++.
- jbj: ispras: stub in macro configuration attaching automated ISPRAS
tests.
- jbj: fix: don't display usage with "rpm -v", it clutters --eval output.
- jbj: rpmdav: fix: rename url -> u using --without-neon. (John Thomson).
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.217 -r1.218 rpmio.c
--- rpm/rpmio/rpmio.c 30 Mar 2010 15:44:35 -0000 1.217
+++ rpm/rpmio/rpmio.c 31 Mar 2010 12:26:21 -0000 1.218
@@ -3252,8 +3252,10 @@
_rpmficlPool = rpmioFreePool(_rpmficlPool);
_rpmaugI = rpmaugFree(_rpmaugI);
_rpmaugPool = rpmioFreePool(_rpmaugPool);
+#ifdef NOTYET /* XXX FIXME: dig out the recursion deadlock. */
_rpmnixI = rpmnixFree(_rpmnixI);
_rpmnixPool = rpmioFreePool(_rpmnixPool);
+#endif
_rpmcudfPool = rpmioFreePool(_rpmcudfPool);
_rpmluavPool = rpmioFreePool(_rpmluavPool);
_rpmluaPool = rpmioFreePool(_rpmluaPool);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
