diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 10:12:35 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 10:12:35 +0200 |
| commit | 7dd61fad9a41ddd4279b51fb86d76a9484876e36 (patch) | |
| tree | c03e3526b908350f5750fcce6b2d257d99d6761f | |
| parent | 3580e481e0dcbb4a39d687137eafcda60d8e85d5 (diff) | |
| parent | 8deb53abcc5c22cdbd8b17e0db8b752c3d2783c8 (diff) | |
* apt-pkg/indexcopy.cc:
- only use trusted.gpg.d directory if it exists
- do not replace /dev/null when running in APT::CDROM::NoAct
mode (LP: #612666), thanks to Colin Watson
| -rw-r--r-- | apt-pkg/indexcopy.cc | 13 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index ed037027c..f88d51fc5 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -132,9 +132,14 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, (*I).c_str() + CDROM.length(),GetFileName()); string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; TargetF += URItoFileName(S); + FileFd Target; if (_config->FindB("APT::CDROM::NoAct",false) == true) + { TargetF = "/dev/null"; - FileFd Target(TargetF,FileFd::WriteAtomic); + Target.Open(TargetF,FileFd::WriteExists); + } else { + Target.Open(TargetF,FileFd::WriteAtomic); + } FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); if (_error->PendingError() == true) return false; @@ -673,9 +678,11 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, std::clog << "Keyring path: " << trustedPath << std::endl; } - std::vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); + std::vector<string> keyrings; + if (DirectoryExists(trustedPath)) + keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); if (FileExists(trustedFile) == true) - keyrings.push_back(trustedFile); + keyrings.push_back(trustedFile); std::vector<const char *> Args; Args.reserve(30); diff --git a/debian/changelog b/debian/changelog index 2791a4e67..1c24a6b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ apt (0.8.2ubuntu1) maverick; urgency=low * apt-pkg/init.cc: - ignore ".distUpgrade" and ".save" files in sources.list.d (LP: #631770) + * apt-pkg/indexcopy.cc: + - only use trusted.gpg.d directory if it exists + - do not replace /dev/null when running in APT::CDROM::NoAct + mode (LP: #612666), thanks to Colin Watson -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200 |