RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Feb-2008 20:14:10 Branch: HEAD Handle: 2008022019140901 Modified files: rpm CHANGES rpm/lib rpmts.c Log: from pixel: librpm uses bavail ie "free blocks avail to non-superuser" that's ok, it will help keeping some free space, even for root but when bavail == 0, librpm thinks statfs failed, and do not check so setting bavail to 1 when bavail it is 0 (no package should fit in one block!) Summary: Revision Changes Path 1.2199 +1 -0 rpm/CHANGES 2.139 +1 -1 rpm/lib/rpmts.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2198 -r1.2199 CHANGES --- rpm/CHANGES 20 Feb 2008 00:39:14 -0000 1.2198 +++ rpm/CHANGES 20 Feb 2008 19:14:09 -0000 1.2199 @@ -1,4 +1,5 @@ 5.0.0 -> 5.1a1: + - pixel: do check free size when bavail is 0 - jbj: add variadic checks, remove warnings. - jbj: refactor rpmcliErase to use same code as rpmtsInstall. - jbj: fix: rpmtsCheck non-zero return prevents --erase. @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmts.c ============================================================================ $ cvs diff -u -r2.138 -r2.139 rpmts.c --- rpm/lib/rpmts.c 20 Feb 2008 00:39:14 -0000 2.138 +++ rpm/lib/rpmts.c 20 Feb 2008 19:14:10 -0000 2.139 @@ -991,7 +991,7 @@ dsi->bneeded = 0; dsi->ineeded = 0; #ifdef STATFS_HAS_F_BAVAIL - dsi->f_bavail = sfb.f_bavail; + dsi->f_bavail = sfb.f_bavail ? sfb.f_bavail : 1; if (sfb.f_ffree > 0 && sfb.f_files > 0 && sfb.f_favail > 0) dsi->f_favail = sfb.f_favail; else /* XXX who knows what evil lurks here? */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org