remove duplicated 'the' from guides doc-base abstract

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 85ec30bd51cd7f727f847bc81f446dacbe340bfd..79ab8cb5282f00e6d94bbaf176793db0c555a70e 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -491,7 +491,11 @@ class Patch {
       for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) {
         std::list<struct Change>::reverse_iterator mg_i, mg_e = ch;
         while (ch->del_cnt == 0 && ch->offset == 0)
+        {
            ++ch;
+           if (unlikely(ch == filechanges.rend()))
+              return;
+        }
         line -= ch->del_cnt;
         std::string buf;
         if (ch->add_cnt > 0) {
@@ -656,6 +660,11 @@ class RredMethod : public aptMethod {
         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;
         }