diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:04 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:04 +0000 |
| commit | 10639577016904cccab77c311e7c0b4363997504 (patch) | |
| tree | d8bc19238e5f23ff14baa392c8f3721c43f4cae8 /apt-pkg | |
| parent | 1b9558767f84987daa91c43083518eab01aa19a0 (diff) | |
Various fixes
Author: jgg
Date: 2001-03-05 02:43:28 GMT
Various fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/pkgcache.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/policy.cc | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index aa3e8565e..ea5c264dc 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.cc,v 1.32 2001/02/20 07:03:17 jgg Exp $ +// $Id: pkgcache.cc,v 1.33 2001/03/05 02:43:28 jgg Exp $ /* ###################################################################### Package Cache - Accessor code for the cache @@ -525,7 +525,7 @@ string pkgCache::VerIterator::RelStr() Seen = true; break; } - if (File2->Version == 0) + if (File2->Version == 0 || File->Version == 0) break; if (strcmp(File.Version(),File2.Version()) == 0) Seen = true; diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index e813a0903..cba28cc6c 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: policy.cc,v 1.3 2001/03/03 23:27:24 jgg Exp $ +// $Id: policy.cc,v 1.4 2001/03/05 02:43:28 jgg Exp $ /* ###################################################################### Package Version Policy implementation @@ -145,12 +145,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) pin that stays at that setting. */ for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++) - { - /* This is a side effect of the condition below, and is added for - completeness, though it should not be necessary */ - if (Ver->Arch == 0) - continue; - + { for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { /* If this is the status file, and the current version is not the |