diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-07 12:51:53 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-07 12:51:53 +0200 |
| commit | 89526664ffeb58fcd97b43bce00ed917ca14f994 (patch) | |
| tree | 6f2463cd3cbece45b120eafb8f7ed0497e4ff266 | |
| parent | b4ffe0b2b20501c7b1f1f66ee81e2fb308b7e82c (diff) | |
| parent | 8220213e48857172d8ebbf3d4914667e372a8930 (diff) | |
merged from debian-sid
| -rw-r--r-- | apt-pkg/indexcopy.cc | 10 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index c2ee1c347..064fb007c 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -75,7 +75,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, // Open the package file FileFd Pkg; - if (FileExists(*I + GetFileName()) == true) + if (RealFileExists(*I + GetFileName()) == true) { Pkg.Open(*I + GetFileName(),FileFd::ReadOnly); FileSize = Pkg.Size(); @@ -532,7 +532,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) // we skip non-existing files in the verifcation to support a cdrom // with no Packages file (just a Package.gz), see LP: #255545 // (non-existing files are not considered a error) - if(!FileExists(prefix+file)) + if(!RealFileExists(prefix+file)) { _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str()); return true; @@ -601,7 +601,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, string const release = *I+"Release"; // a Release.gpg without a Release should never happen - if(FileExists(release) == false) + if(RealFileExists(release) == false) { delete MetaIndex; continue; @@ -681,7 +681,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, std::vector<string> keyrings; if (DirectoryExists(trustedPath)) keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); - if (FileExists(trustedFile) == true) + if (RealFileExists(trustedFile) == true) keyrings.push_back(trustedFile); std::vector<const char *> Args; @@ -788,7 +788,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ // Open the package file FileFd Pkg; - if (FileExists(*I) == true) + if (RealFileExists(*I) == true) { Pkg.Open(*I,FileFd::ReadOnly); FileSize = Pkg.Size(); diff --git a/debian/changelog b/debian/changelog index 9f80cbc7c..6d0000400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ apt (0.8.13.2ubuntu2) UNRELEASED; urgency=low - run unattended-upgrades even if there was a error during the apt-get update (LP: #676295) + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + [ David Kalnischkies ] * apt-pkg/pkgcache.cc: - use the native Architecture stored in the cache header instead of |