Add conflict with manpages-pl

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 7236efd03743c56140ca807eeb0b3ede3b1a797c..262c78cabdfa99a2425767199ae6ff7ff7fbc00f 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -229,7 +229,6 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,                /*{{{*/
 #ifdef _POSIX_MAPPED_FILES
        MMap ed_cmds(Patch, MMap::ReadOnly);
        MMap in_file(From, MMap::ReadOnly);
-       FILE* fTo = fdopen(out_file.Fd(), "w");
 
        if (ed_cmds.Size() == 0 || in_file.Size() == 0)
                return MMAP_FAILED;
@@ -420,8 +419,6 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,                /*{{{*/
        delete [] iov;
        free(commands);
 
-       fflush(fTo);
-
        return ED_OK;
 #else
        return MMAP_FAILED;
@@ -465,10 +462,14 @@ bool RredMethod::Fetch(FetchItem *Itm)                                            /*{{{*/
       if (_error->PendingError() == true)
          return false;
       if (patchFile(Patch, From, To, &Hash) != ED_OK) {
-        return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (1)").c_str());
+        return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str());
+      } else if (Debug == true) {
+        std::clog << "rred: finished file patching of " << Path  << " after mmap failed." << std::endl;
       }
    } else if (result != ED_OK) {
-      return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (2)").c_str());
+      return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str());
+   } else if (Debug == true) {
+      std::clog << "rred: finished mmap patching of " << Path << std::endl;
    }
 
    // write out the result
@@ -491,12 +492,10 @@ bool RredMethod::Fetch(FetchItem *Itm)                                            /*{{{*/
       return _error->Errno("stat",_("Failed to stat"));
 
    // return done
-   if (Itm->Uri.empty() == true) {
-      Res.LastModified = Buf.st_mtime;
-      Res.Size = Buf.st_size;
-      Res.TakeHashes(Hash);
-      URIDone(Res);
-   }
+   Res.LastModified = Buf.st_mtime;
+   Res.Size = Buf.st_size;
+   Res.TakeHashes(Hash);
+   URIDone(Res);
 
    return true;
 }
@@ -530,7 +529,7 @@ public:
  *  and will write the result to "Testfile.result".
  */
 int main(int argc, char *argv[]) {
-       if (argc == 0) {
+       if (argc <= 1) {
                RredMethod Mth;
                return Mth.Run();
        } else {