From: Michael Vogt <egon@tas>
Date: Thu, 7 Dec 2006 10:10:32 +0000 (+0100)
Subject: * apt-pkg/acquire-item.cc:
X-Git-Tag: 0.7.21~284^2~9^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7106240056767caad5a55fe9c542842065cb5829

* apt-pkg/acquire-item.cc:
  - merged the NMU pdiff fix and make the code a bit more readable
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a51b6f12d..6831abd54 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -270,15 +270,8 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
 	 }
       }
 
-      // no information how to get the patches, bail out
-      if(!found) 
-      {
-	 if(Debug)
-	    std::clog << "Can't find a patch in the index file" << std::endl;
-	 // Failed will queue a big package file
-	 Failed("", NULL);
-      } 
-      else 
+      // we have something, queue the next diff
+      if(found) 
       {
 	 // queue the diffs
 	 new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
@@ -290,6 +283,11 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
       }
    }
 
+   // Nothing found, report and return false
+   // Failing here is ok, if we return false later, the full
+   // IndexFile is queued
+   if(Debug)
+      std::clog << "Can't find a patch in the index file" << std::endl;
    return false;
 }