RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Nov-2010 15:44:57
Branch: rpm-5_3 Handle: 2010110114445601
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/lib rpmgi.c
Log:
fix assert failure with Fadvise() on non-existing files.
Summary:
Revision Changes Path
1.3296.2.111+1 -0 rpm/CHANGES
2.72.2.3 +2 -1 rpm/lib/rpmgi.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.110 -r1.3296.2.111 CHANGES
--- rpm/CHANGES 31 Oct 2010 16:20:36 -0000 1.3296.2.110
+++ rpm/CHANGES 1 Nov 2010 14:44:56 -0000 1.3296.2.111
@@ -1,4 +1,5 @@
5.3.5 -> 5.3.6:
+ - proyvind: fix assert failure with Fadvise() on non-existing files.
- proyvind: ditch %gem_unpack macro and make %setup automatically handle
ruby gem extraction in stead.
- proyvind: mandriva: fix 'Conflicts: dependencies without release
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.72.2.2 -r2.72.2.3 rpmgi.c
--- rpm/lib/rpmgi.c 29 Sep 2010 14:55:00 -0000 2.72.2.2
+++ rpm/lib/rpmgi.c 1 Nov 2010 14:44:57 -0000 2.72.2.3
@@ -108,7 +108,8 @@
fn = _free(fn);
#if defined(POSIX_FADV_WILLNEED)
- (void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
+ if(fd != NULL)
+ (void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
#endif
return fd;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
