From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 5 Jun 2010 17:14:32 +0000 (+0200)
Subject: do not fail if an unrelated error is pending in DisplayRecord()
X-Git-Tag: 0.8.0~9^2~39^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/07c279d93f0b61e96c9caf8139accd0289feab56

do not fail if an unrelated error is pending in DisplayRecord()
---

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index ef074280e..de4288c5a 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1243,11 +1243,11 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
    pkgCache::PkgFileIterator I = Vf.File();
    if (I.IsOk() == false)
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
-   
-   FileFd PkgF(I.FileName(),FileFd::ReadOnly);
-   if (_error->PendingError() == true)
+
+   FileFd PkgF;
+   if (PkgF.Open(I.FileName(), FileFd::ReadOnly) == false)
       return false;
-   
+
    // Read the record
    unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1];
    Buffer[V.FileList()->Size] = '\n';