Fixed dumpavail some more

Author: jgg
Date: 1999-03-18 04:52:51 GMT
Fixed dumpavail some more

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 8f47739a50eebf01778ba2640e4f39d06fd55ba6..a235ad9a17f82dbaf58f8ad9902736a99e70fac8 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.29 1999/03/17 03:25:25 jgg Exp $
+// $Id: apt-cache.cc,v 1.30 1999/03/18 04:52:51 jgg Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache files
 /* ######################################################################
    
    apt-cache - Manages the cache files


@@ -333,15 +333,19 @@ bool Dump(CommandLine &Cmd)
                                                                        /*}}}*/
 // GetCandidateVer - Returns the Candidate install version             /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // GetCandidateVer - Returns the Candidate install version             /*{{{*/
 // ---------------------------------------------------------------------

-/* This should really use the DepCache or something.. Copied from there. */
-static pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg)
+/* This should really use the DepCache or something.. Copied from there. 
+   Allow current is required to filter out the status file when emitting
+   an available file. */
+static pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg,
+                                            bool AllowCurrent = true)

 {
    /* Not source/not automatic versions cannot be a candidate version 
     unless they are already installed */
    for (pkgCache::VerIterator I = Pkg.VersionList(); I.end() == false; I++)
    {
 {
    /* Not source/not automatic versions cannot be a candidate version 
     unless they are already installed */
    for (pkgCache::VerIterator I = Pkg.VersionList(); I.end() == false; I++)
    {

-      if (Pkg.CurrentVer() == I)
+      if (Pkg.CurrentVer() == I && AllowCurrent == true)

         return I;
         return I;

+      

       for (pkgCache::VerFileIterator J = I.FileList(); J.end() == false; J++)
         if ((J.File()->Flags & pkgCache::Flag::NotSource) == 0 &&
             (J.File()->Flags & pkgCache::Flag::NotAutomatic) == 0)
       for (pkgCache::VerFileIterator J = I.FileList(); J.end() == false; J++)
         if ((J.File()->Flags & pkgCache::Flag::NotSource) == 0 &&
             (J.File()->Flags & pkgCache::Flag::NotAutomatic) == 0)


@@ -361,6 +365,9 @@ bool DumpAvail(CommandLine &Cmd)
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)
    {
 
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++)
    {

+      if ((I->Flags & pkgCache::Flag::NotSource) != 0)
+        continue;
+      

       if (I.IsOk() == false)
       {
         delete [] Buffer;
       if (I.IsOk() == false)
       {
         delete [] Buffer;


@@ -379,7 +386,7 @@ bool DumpAvail(CommandLine &Cmd)
       for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
       {
         // Find the proper version to use. We should probably use the DepCache.
       for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
       {
         // Find the proper version to use. We should probably use the DepCache.

-        pkgCache::VerIterator V = GetCandidateVer(P);
+        pkgCache::VerIterator V = GetCandidateVer(P,false);

 
         if (V.end() == true || V.FileList().File() != I)
            continue;
 
         if (V.end() == true || V.FileList().File() != I)
            continue;

diff --git a/dselect/update b/dselect/update
index ec5e78cc232d4874a6d720ca12bb5b6097e8f7c9..87dc21aa1d99582bc473829b93166f1307eaa4dc 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -14,6 +14,9 @@ RES=`apt-config shell OPTS DSelect::UpdateOptions \
       PROMPT DSelect::PromptAfterUpdate`
 eval $RES
 
       PROMPT DSelect::PromptAfterUpdate`
 eval $RES
 

+# It looks slightly ugly to have a double / in the dpkg output
+CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
+

 $APTGET $OPTS update
 
 echo "Merging Available information"
 $APTGET $OPTS update
 
 echo "Merging Available information"