Fixed sort order

Author: jgg
Date: 1999-09-05 20:27:28 GMT
Fixed sort order

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 18888b4d942a8ee3a70cace8a5f8d1ccb04c75ea..b56b441c40a2060e039abe029c2bc05dfb73e217 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.72 1999/08/04 05:37:18 jgg Exp $
+// $Id: apt-get.cc,v 1.73 1999/09/05 20:27:37 jgg Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -270,15 +270,16 @@ void ShowDel(ostream &out,CacheFile &Cache)
 // ShowKept - Show kept packages                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowKept - Show kept packages                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void ShowKept(ostream &out,pkgDepCache &Dep)
+void ShowKept(ostream &out,CacheFile &Cache)

 {
 {

-   pkgCache::PkgIterator I = Dep.PkgBegin();

    string List;
    string List;

-   for (;I.end() != true; I++)
+   for (unsigned J = 0; J < Cache->Head().PackageCount; J++)

    {    
    {    

+      pkgCache::PkgIterator I(Cache,Cache.List[J]);
+      

       // Not interesting
       // Not interesting

-      if (Dep[I].Upgrade() == true || Dep[I].Upgradable() == false ||
-         I->CurrentVer == 0 || Dep[I].Delete() == true)
+      if (Cache[I].Upgrade() == true || Cache[I].Upgradable() == false ||
+         I->CurrentVer == 0 || Cache[I].Delete() == true)

         continue;
       
       List += string(I.Name()) + " ";
         continue;
       
       List += string(I.Name()) + " ";

diff --git a/debian/changelog b/debian/changelog
index 52dc8f2feb0fabc6b4dc7bf5cc4b4a855115ca64..40156dbc6c1dadd8c0fa6b1b9c1f1b0e034bb3d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.3.12.1) unstable; urgency=low
+  
+  * Fix timestamp miss in FTP. Closes: #44363
+  * Fix sorting of Kept packages. Closes: #44377
+  
+ -- Jason Gunthorpe <jgg@debian.org>  Fri,  3 Sep 1999 09:04:28 -0700
+ 

 apt (0.3.12) unstable; urgency=low
   
   * Fix for typo in the dhelp index. Closes: #40377
 apt (0.3.12) unstable; urgency=low
   
   * Fix for typo in the dhelp index. Closes: #40377