if reading of autobit state failed, let write fail

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index e568c75b2954a7f26ce804f0d80d6e506c5099ab..51af3755784567aa84d47428b1f713d7ac384a81 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -10,7 +10,6 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>


@@ -660,6 +659,11 @@ class RredMethod : public aptMethod {
         out.Close();
         inp.Close();
 
         out.Close();
         inp.Close();
 

+        if (_error->PendingError() == true) {
+           std::cerr << "FAILED to read or write files" << std::endl;
+           return false;
+        }
+

         if (Debug == true) {
            std::clog << "rred: finished file patching of " << Path  << "." << std::endl;
         }
         if (Debug == true) {
            std::clog << "rred: finished file patching of " << Path  << "." << std::endl;
         }


@@ -699,8 +703,7 @@ int main(int argc, char **argv)
    Patch patch;
 
    if (argc <= 1) {
    Patch patch;
 
    if (argc <= 1) {

-      RredMethod Mth;
-      return Mth.Run();
+      return RredMethod().Run();

    }
 
    // Usage: rred -t input output diff ...
    }
 
    // Usage: rred -t input output diff ...