Просмотр исходного кода

* apt-pkg/contrib/mmap.cc:
- don't fail if msync() returns > 0 (LP: #144001)

Colin Watson лет назад: 19
Родитель
Сommit
296e7f4b92
2 измененных файлов с 9 добавлено и 2 удалено
  1. 2 2
      apt-pkg/contrib/mmap.cc
  2. 7 0
      debian/changelog

+ 2 - 2
apt-pkg/contrib/mmap.cc

@@ -117,7 +117,7 @@ bool MMap::Sync()
    
    
 #ifdef _POSIX_SYNCHRONIZED_IO   
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)
    if ((Flags & ReadOnly) != ReadOnly)
-      if (msync((char *)Base,iSize,MS_SYNC) != 0)
+      if (msync((char *)Base,iSize,MS_SYNC) < 0)
 	 return _error->Errno("msync","Unable to write mmap");
 	 return _error->Errno("msync","Unable to write mmap");
 #endif   
 #endif   
    return true;
    return true;
@@ -134,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 #ifdef _POSIX_SYNCHRONIZED_IO
 #ifdef _POSIX_SYNCHRONIZED_IO
    unsigned long PSize = sysconf(_SC_PAGESIZE);
    unsigned long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)
    if ((Flags & ReadOnly) != ReadOnly)
-      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
+      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
 	 return _error->Errno("msync","Unable to write mmap");
 	 return _error->Errno("msync","Unable to write mmap");
 #endif   
 #endif   
    return true;
    return true;

+ 7 - 0
debian/changelog

@@ -1,3 +1,10 @@
+apt (0.7.6ubuntu11) UNRELEASED; urgency=low
+
+  * apt-pkg/contrib/mmap.cc:
+    - don't fail if msync() returns > 0 (LP: #144001)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 22 Sep 2007 21:21:19 +0100
+
 apt (0.7.6ubuntu10) gutsy; urgency=low
 apt (0.7.6ubuntu10) gutsy; urgency=low
 
 
   * apt-pkg/deb/dpkgpm.cc:
   * apt-pkg/deb/dpkgpm.cc: