Various fixes

Author: jgg
Date: 2001-03-05 02:43:28 GMT
Various fixes

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index aa3e8565eb40285fa123ba2ed3d4e7c27b3e4ed4..ea5c264dc9e9291b35daef30577540f6807484c8 100644 (file)
--- 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 e813a09037722bbb2db9df9217b705bff5cc7edc..cba28cc6c67663f53f9991c3f8e7476f8271a404 100644 (file)
--- 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

diff --git a/debian/changelog b/debian/changelog
index f2324b14773047220504b7f1583f17792d1cde48..f6470cdff36e89166a689e99f177801f95231ec0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 apt (0.5.2) unstable; urgency=low
 
   * Fixed mention of /usr/doc in the long description
+  * JoeyH's downgrade bug -- don't use 0.5.1
+  * Doc bug. Closes: #88538
+  * Fault in building release strings. Closes: #88533
   
  -- Jason Gunthorpe <jgg@debian.org>  Sun,  4 Mar 2001 15:39:43 -0700