diff options
| author | Michael Vogt <mvo@debian.org> | 2005-10-23 09:32:05 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-10-23 09:32:05 +0000 |
| commit | d1b8c68a3159198ea51ba8de38d289e5aa0010bc (patch) | |
| tree | 5fc4a920c1a98bdeaa006eec44183db0eb2e53c0 | |
| parent | ba130675088a7e10365ef932c0c0b548bd2586ad (diff) | |
| parent | 7049e4e9ca6db15326d8a76f4f5f9ab592a925e3 (diff) | |
* merge with apt--mvo
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
* be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3475d79ae..040f670b1 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); } - else if(DefRel.empty() == false) + else if(DefRel.empty() == false) { // we have a default release, try to locate the pkg. we do it like // this because GetCandidateVer() will not "downgrade", that means @@ -1211,6 +1211,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { + // extra paranioa + if(VF.File() == NULL) + continue; + /* If this is the status file, and the current version is not the version in the status file (ie it is not installed, or somesuch) then it is not a candidate for installation, ever. This weeds diff --git a/debian/changelog b/debian/changelog index 932ac592f..9716c3836 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.6.42.1) unstable; urgency=low * apt-pkg/pkgrecords.cc: - revert patch from last version, it causes trouble on alpha and ia64 (closes: #335102, #335103) + * cmdline/apt-get.cc: + - be extra carefull in FindSrc (closes: #335213) -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200 |