From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 18 Feb 2012 18:17:57 +0000 (+0100)
Subject: ensure that the cache-directories are really directories before
X-Git-Tag: 0.9.0~13^2~27
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c0d58f4276a75f3cd6ebedf20458321a3477a048

ensure that the cache-directories are really directories before
trying to get a list of included files from them
---

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index e425c940d..f852542e5 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -182,7 +182,7 @@ void pkgCacheFile::RemoveCaches()
    {
       std::string cachedir = flNotFile(pkgcache);
       std::string cachefile = flNotDir(pkgcache);
-      if (cachedir.empty() != true && cachefile.empty() != true)
+      if (cachedir.empty() != true && cachefile.empty() != true && DirectoryExists(cachedir) == true)
       {
 	 cachefile.append(".");
 	 std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);
@@ -201,7 +201,7 @@ void pkgCacheFile::RemoveCaches()
 
    std::string cachedir = flNotFile(srcpkgcache);
    std::string cachefile = flNotDir(srcpkgcache);
-   if (cachedir.empty() == true || cachefile.empty() == true)
+   if (cachedir.empty() == true || cachefile.empty() == true || DirectoryExists(cachedir) == false)
       return;
    cachefile.append(".");
    std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);