diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-10-25 15:43:35 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-10-25 15:43:35 +0000 |
| commit | 5ef2f78cb2506517e18554585106be6ed9eeb9b1 (patch) | |
| tree | d879ed314cd59b1fe6f5502f0caf0dde4ecd4951 /cmdline/apt-get.cc | |
| parent | 39454cbb10cc707adba05f78c87d32cdaec6a934 (diff) | |
| parent | 7049e4e9ca6db15326d8a76f4f5f9ab592a925e3 (diff) | |
Merge with Michael and add update-po as a pre-req for binary
* po/makefile: Add update-po as a prerequisite of binary. Closes: #329910
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
* fix a incorrect example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
* revert patch from patch-59, causes all sorts of trouble
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
* fix changelog
* 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
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 6 |
1 files changed, 5 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 |