Various bug fixes

[apt.git] / cmdline / apt-cache.cc

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 803691cabc5a1fad4fc59ad6bd7e3340bdaf20d7..a11594f2179948cdf68add1880f0a07fb4249524 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-cache.cc,v 1.47 2001/04/29 05:13:51 jgg Exp $
+// $Id: apt-cache.cc,v 1.51 2001/06/10 02:03:33 jgg Exp $
 /* ######################################################################
    
    apt-cache - Manages the cache files
@@ -188,7 +188,7 @@ bool DumpPackage(CommandLine &CmdL)
       {
         cout << "  " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name();
         if (D->Version != 0)
-           cout << ' ' << D.TargetVer() << endl;
+           cout << ' ' << DeNull(D.TargetVer()) << endl;
         else
            cout << endl;
       }
@@ -198,7 +198,7 @@ bool DumpPackage(CommandLine &CmdL)
       {
         cout << Cur.VerStr() << " - ";
         for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++)
-           cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << Dep.TargetVer() << ") ";
+           cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";
         cout << endl;
       }      
 
@@ -337,7 +337,8 @@ bool Dump(CommandLine &Cmd)
         cout << " Version: " << V.VerStr() << endl;
         cout << "     File: " << V.FileList().File().FileName() << endl;
         for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
-           cout << "  Depends: " << D.TargetPkg().Name() << ' ' << D.TargetVer() << endl;
+           cout << "  Depends: " << D.TargetPkg().Name() << ' ' << 
+                            DeNull(D.TargetVer()) << endl;
       }      
    }
 
@@ -349,13 +350,13 @@ bool Dump(CommandLine &Cmd)
       cout << " ID: " << F->ID << endl;
       cout << " Flags: " << F->Flags << endl;
       cout << " Time: " << TimeRFC1123(F->mtime) << endl;
-      cout << " Archive: " << F.Archive() << endl;
-      cout << " Component: " << F.Component() << endl;
-      cout << " Version: " << F.Version() << endl;
-      cout << " Origin: " << F.Origin() << endl;
-      cout << " Site: " << F.Site() << endl;
-      cout << " Label: " << F.Label() << endl;
-      cout << " Architecture: " << F.Architecture() << endl;
+      cout << " Archive: " << DeNull(F.Archive()) << endl;
+      cout << " Component: " << DeNull(F.Component()) << endl;
+      cout << " Version: " << DeNull(F.Version()) << endl;
+      cout << " Origin: " << DeNull(F.Origin()) << endl;
+      cout << " Site: " << DeNull(F.Site()) << endl;
+      cout << " Label: " << DeNull(F.Label()) << endl;
+      cout << " Architecture: " << DeNull(F.Architecture()) << endl;
    }
 
    return true;
@@ -474,7 +475,7 @@ bool DumpAvail(CommandLine &Cmd)
         if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
         {
            pkgTagSection Tags;
-           TFRewriteData RW[] = {{"Status",0},{}};
+           TFRewriteData RW[] = {{"Status",0},{"Config-Version",0},{}};
            const char *Zero = 0;
            if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||
                TFRewrite(stdout,Tags,&Zero,RW) == false)
@@ -1258,6 +1259,7 @@ bool ShowHelp(CommandLine &Cmd)
       "   depends - Show raw dependency information for a package\n"
       "   pkgnames - List the names of all packages\n"
       "   dotty - Generate package graphs for GraphVis\n"
+      "   policy - Show policy settings\n"
       "\n"
       "Options:\n"
       "  -h   This help text.\n"