* apt-pkg/packageset.h:

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

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0e950310be80214cc0b5f40392e2884604b4d149..10dbf44d24ff37c6dae5f5c44d07aeb371b8c633 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -14,7 +14,9 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/error.h>
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/error.h>

+#include <cassert>

 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/pkgcachegen.h>

+#include <apt-pkg/cachefile.h>

 #include <apt-pkg/init.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>


@@ -139,7 +141,7 @@ bool UnMet(CommandLine &CmdL)
            // Oops, it failed..
            if (Header == false)
               ioprintf(cout,_("Package %s version %s has an unmet dep:\n"),
            // Oops, it failed..
            if (Header == false)
               ioprintf(cout,_("Package %s version %s has an unmet dep:\n"),

-                       P.Name(),V.VerStr());
+                       P.FullName(true).c_str(),V.VerStr());

            Header = true;
            
            // Print out the dep type
            Header = true;
            
            // Print out the dep type


@@ -149,7 +151,7 @@ bool UnMet(CommandLine &CmdL)
            Start = RealStart;
            do
            {
            Start = RealStart;
            do
            {

-              cout << Start.TargetPkg().Name();
+              cout << Start.TargetPkg().FullName(true);

               if (Start.TargetVer() != 0)
                  cout << " (" << Start.CompType() << " " << Start.TargetVer() <<
                  ")";
               if (Start.TargetVer() != 0)
                  cout << " (" << Start.CompType() << " " << Start.TargetVer() <<
                  ")";


@@ -182,7 +184,7 @@ bool DumpPackage(CommandLine &CmdL)
         continue;
       }
 
         continue;
       }
 

-      cout << "Package: " << Pkg.Name() << endl;
+      cout << "Package: " << Pkg.FullName(true) << endl;

       cout << "Versions: " << endl;
       for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
       {
       cout << "Versions: " << endl;
       for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++)
       {


@@ -204,7 +206,7 @@ bool DumpPackage(CommandLine &CmdL)
       cout << "Reverse Depends: " << endl;
       for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++)
       {
       cout << "Reverse Depends: " << endl;
       for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++)
       {

-        cout << "  " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name();
+        cout << "  " << D.ParentPkg().FullName(true) << ',' << D.TargetPkg().FullName(true);

         if (D->Version != 0)
            cout << ' ' << DeNull(D.TargetVer()) << endl;
         else
         if (D->Version != 0)
            cout << ' ' << DeNull(D.TargetVer()) << endl;
         else


@@ -216,7 +218,7 @@ bool DumpPackage(CommandLine &CmdL)
       {
         cout << Cur.VerStr() << " - ";
         for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++)
       {
         cout << Cur.VerStr() << " - ";
         for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++)

-           cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";
+           cout << Dep.TargetPkg().FullName(true) << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") ";

         cout << endl;
       }      
 
         cout << endl;
       }      
 


@@ -225,12 +227,12 @@ bool DumpPackage(CommandLine &CmdL)
       {
         cout << Cur.VerStr() << " - ";
         for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++)
       {
         cout << Cur.VerStr() << " - ";
         for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++)

-           cout << Prv.ParentPkg().Name() << " ";
+           cout << Prv.ParentPkg().FullName(true) << " ";

         cout << endl;
       }
       cout << "Reverse Provides: " << endl;
       for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++)
         cout << endl;
       }
       cout << "Reverse Provides: " << endl;
       for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++)

-        cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr() << endl;            
+        cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr() << endl;

    }
 
    return true;
    }
 
    return true;


@@ -242,7 +244,9 @@ bool DumpPackage(CommandLine &CmdL)
 bool Stats(CommandLine &Cmd)
 {
    pkgCache &Cache = *GCache;
 bool Stats(CommandLine &Cmd)
 {
    pkgCache &Cache = *GCache;

-   cout << _("Total package names: ") << Cache.Head().PackageCount << " (" <<
+   cout << _("Total package names: ") << Cache.Head().GroupCount << " (" <<
+      SizeToStr(Cache.Head().GroupCount*Cache.Head().GroupSz) << ')' << endl
+        << _("Total package structures: ") << Cache.Head().PackageCount << " (" <<

       SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;
 
    int Normal = 0;
       SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;
 
    int Normal = 0;


@@ -353,13 +357,13 @@ bool Dump(CommandLine &Cmd)
    
    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
    {
    
    for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
    {

-      cout << "Package: " << P.Name() << endl;
+      cout << "Package: " << P.FullName(true) << endl;

       for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
       {
         cout << " Version: " << V.VerStr() << endl;
         cout << "     File: " << V.FileList().File().FileName() << endl;
         for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
       for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++)
       {
         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() << ' ' << 
+           cout << "  Depends: " << D.TargetPkg().FullName(true) << ' ' << 

                             DeNull(D.TargetVer()) << endl;
         for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++)
         {
                             DeNull(D.TargetVer()) << endl;
         for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++)
         {


@@ -570,11 +574,11 @@ bool Depends(CommandLine &CmdL)
         pkgCache::VerIterator Ver = Pkg.VersionList();
         if (Ver.end() == true)
         {
         pkgCache::VerIterator Ver = Pkg.VersionList();
         if (Ver.end() == true)
         {

-           cout << '<' << Pkg.Name() << '>' << endl;
+           cout << '<' << Pkg.FullName(true) << '>' << endl;

            continue;
         }
         
            continue;
         }
         

-        cout << Pkg.Name() << endl;
+        cout << Pkg.FullName(true) << endl;

         
         for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
         {
         
         for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
         {


@@ -596,9 +600,9 @@ bool Depends(CommandLine &CmdL)
            
                // Show the package
                if (Trg->VersionList == 0)
            
                // Show the package
                if (Trg->VersionList == 0)

-                 cout << D.DepType() << ": <" << Trg.Name() << ">" << endl;
+                 cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl;

                else
                else

-                 cout << D.DepType() << ": " << Trg.Name() << endl;
+                 cout << D.DepType() << ": " << Trg.FullName(true) << endl;

            
                if (Recurse == true)
                  Colours[D.TargetPkg()->ID]++;
            
                if (Recurse == true)
                  Colours[D.TargetPkg()->ID]++;


@@ -614,7 +618,7 @@ bool Depends(CommandLine &CmdL)
               if (V != Cache.VerP + V.ParentPkg()->VersionList ||
                   V->ParentPkg == D->Package)
                  continue;
               if (V != Cache.VerP + V.ParentPkg()->VersionList ||
                   V->ParentPkg == D->Package)
                  continue;

-              cout << "    " << V.ParentPkg().Name() << endl;
+              cout << "    " << V.ParentPkg().FullName(true) << endl;

               
               if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;
               
               if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;


@@ -663,11 +667,11 @@ bool RDepends(CommandLine &CmdL)
         pkgCache::VerIterator Ver = Pkg.VersionList();
         if (Ver.end() == true)
         {
         pkgCache::VerIterator Ver = Pkg.VersionList();
         if (Ver.end() == true)
         {

-           cout << '<' << Pkg.Name() << '>' << endl;
+           cout << '<' << Pkg.FullName(true) << '>' << endl;

            continue;
         }
         
            continue;
         }
         

-        cout << Pkg.Name() << endl;
+        cout << Pkg.FullName(true) << endl;

         
         cout << "Reverse Depends:" << endl;
         for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++)
         
         cout << "Reverse Depends:" << endl;
         for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++)


@@ -684,9 +688,9 @@ bool RDepends(CommandLine &CmdL)
                  cout << "  ";
 
                if (Trg->VersionList == 0)
                  cout << "  ";
 
                if (Trg->VersionList == 0)

-                 cout << D.DepType() << ": <" << Trg.Name() << ">" << endl;
+                 cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl;

                else
                else

-                 cout << Trg.Name() << endl;
+                 cout << Trg.FullName(true) << endl;

 
                if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;
 
                if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;


@@ -702,7 +706,7 @@ bool RDepends(CommandLine &CmdL)
               if (V != Cache.VerP + V.ParentPkg()->VersionList ||
                   V->ParentPkg == D->Package)
                  continue;
               if (V != Cache.VerP + V.ParentPkg()->VersionList ||
                   V->ParentPkg == D->Package)
                  continue;

-              cout << "    " << V.ParentPkg().Name() << endl;
+              cout << "    " << V.ParentPkg().FullName(true) << endl;

               
               if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;
               
               if (Recurse == true)
                  Colours[D.ParentPkg()->ID]++;


@@ -863,7 +867,7 @@ bool XVcg(CommandLine &CmdL)
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {

-              printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.Name(), D.TargetPkg().Name() );
+              printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.FullName(true).c_str(), D.TargetPkg().FullName(true).c_str() );

               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)
               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)


@@ -922,14 +926,18 @@ bool XVcg(CommandLine &CmdL)
         continue;
 
       if (Show[Pkg->ID] == DoneNR)
         continue;
 
       if (Show[Pkg->ID] == DoneNR)

-        printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.Name(), Pkg.Name(),
+        printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
       else
                Shapes[ShapeMap[Pkg->ID]]);
       else

-       printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.Name(), Pkg.Name(), 
+       printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
       
    }
                Shapes[ShapeMap[Pkg->ID]]);
       
    }

-   
+
+   delete[] Show;
+   delete[] Flags;
+   delete[] ShapeMap;
+

    printf("}\n");
    return true;
 }
    printf("}\n");
    return true;
 }


@@ -1080,7 +1088,7 @@ bool Dotty(CommandLine &CmdL)
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {
            // Only graph critical deps     
            if (D.IsCritical() == true)
            {

-              printf("\"%s\" -> \"%s\"",Pkg.Name(),D.TargetPkg().Name());
+              printf("\"%s\" -> \"%s\"",Pkg.FullName(true).c_str(),D.TargetPkg().FullName(true).c_str());

               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)
               
               // Colour the node for recursion
               if (Show[D.TargetPkg()->ID] <= DoneNR)


@@ -1134,10 +1142,10 @@ bool Dotty(CommandLine &CmdL)
       
       // Orange box for early recursion stoppage
       if (Show[Pkg->ID] == DoneNR)
       
       // Orange box for early recursion stoppage
       if (Show[Pkg->ID] == DoneNR)

-        printf("\"%s\" [color=orange,shape=%s];\n",Pkg.Name(),
+        printf("\"%s\" [color=orange,shape=%s];\n",Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
       else
                Shapes[ShapeMap[Pkg->ID]]);
       else

-        printf("\"%s\" [shape=%s];\n",Pkg.Name(),
+        printf("\"%s\" [shape=%s];\n",Pkg.FullName(true).c_str(),

                Shapes[ShapeMap[Pkg->ID]]);
    }
    
                Shapes[ShapeMap[Pkg->ID]]);
    }
    


@@ -1400,6 +1408,29 @@ bool Search(CommandLine &CmdL)
        return _error->Error("Write to stdout failed");
    return true;
 }
        return _error->Error("Write to stdout failed");
    return true;
 }

+
+
+/* show automatically installed packages (sorted) */
+bool ShowAuto(CommandLine &CmdL)
+{
+   OpProgress op;
+   pkgDepCache DepCache(GCache);
+   DepCache.Init(&op);
+
+   std::vector<string> packages;
+   packages.reserve(GCache->HeaderP->PackageCount / 3);
+   
+   for (pkgCache::PkgIterator P = GCache->PkgBegin(); P.end() == false; P++)
+      if (DepCache[P].Flags & pkgCache::Flag::Auto)
+         packages.push_back(P.Name());
+
+    std::sort(packages.begin(), packages.end());
+    
+    for (vector<string>::iterator I = packages.begin(); I != packages.end(); I++)
+            cout << *I << "\n";
+
+   return true;
+}

                                                                        /*}}}*/
 // ShowPackage - Dump the package record to the screen                 /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ShowPackage - Dump the package record to the screen                 /*{{{*/
 // ---------------------------------------------------------------------


@@ -1413,11 +1444,15 @@ bool ShowPackage(CommandLine &CmdL)
    
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
    
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {

+      // FIXME: Handle the case in which pkgname name:arch is not found

       pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
       if (Pkg.end() == true)
       {
       pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
       if (Pkg.end() == true)
       {

-        _error->Warning(_("Unable to locate package %s"),*I);
-        continue;
+        Pkg = Cache.FindPkg(*I, "any");
+        if (Pkg.end() == true) {
+               _error->Warning(_("Unable to locate package %s"),*I);
+               continue;
+        }

       }
 
       ++found;
       }
 
       ++found;


@@ -1453,16 +1488,17 @@ bool ShowPackage(CommandLine &CmdL)
 bool ShowPkgNames(CommandLine &CmdL)
 {
    pkgCache &Cache = *GCache;
 bool ShowPkgNames(CommandLine &CmdL)
 {
    pkgCache &Cache = *GCache;

-   pkgCache::PkgIterator I = Cache.PkgBegin();
-   bool All = _config->FindB("APT::Cache::AllNames","false");
-   
+   pkgCache::GrpIterator I = Cache.GrpBegin();
+   bool const All = _config->FindB("APT::Cache::AllNames","false");
+

    if (CmdL.FileList[1] != 0)
    {
       for (;I.end() != true; I++)
       {
    if (CmdL.FileList[1] != 0)
    {
       for (;I.end() != true; I++)
       {

-        if (All == false && I->VersionList == 0)
+        if (All == false && I->FirstPackage == 0)
+           continue;
+        if (I.FindPkg("any")->VersionList == 0)

            continue;
            continue;

-        

         if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0)
            cout << I.Name() << endl;
       }
         if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0)
            cout << I.Name() << endl;
       }


@@ -1473,7 +1509,9 @@ bool ShowPkgNames(CommandLine &CmdL)
    // Show all pkgs
    for (;I.end() != true; I++)
    {
    // Show all pkgs
    for (;I.end() != true; I++)
    {

-      if (All == false && I->VersionList == 0)
+      if (All == false && I->FirstPackage == 0)
+        continue;
+      if (I.FindPkg("any")->VersionList == 0)

         continue;
       cout << I.Name() << endl;
    }
         continue;
       cout << I.Name() << endl;
    }


@@ -1494,15 +1532,26 @@ bool ShowSrcPackage(CommandLine &CmdL)
    if (_error->PendingError() == true)
       return false;
 
    if (_error->PendingError() == true)
       return false;
 

+   unsigned found = 0;

    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       SrcRecs.Restart();
       
       pkgSrcRecords::Parser *Parse;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       SrcRecs.Restart();
       
       pkgSrcRecords::Parser *Parse;

-      while ((Parse = SrcRecs.Find(*I,false)) != 0)
-        cout << Parse->AsStr() << endl;;
+      unsigned found_this = 0;
+      while ((Parse = SrcRecs.Find(*I,false)) != 0) {
+        cout << Parse->AsStr() << endl;;
+        found++;
+        found_this++;
+      }
+      if (found_this == 0) {
+        _error->Warning(_("Unable to locate package %s"),*I);
+        continue;
+      }

    }      
    }      

-   return true;
+   if (found > 0)
+        return true;
+   return _error->Error(_("No packages found"));

 }
                                                                        /*}}}*/
 // Policy - Show the results of the preferences file                   /*{{{*/
 }
                                                                        /*}}}*/
 // Policy - Show the results of the preferences file                   /*{{{*/


@@ -1550,7 +1599,7 @@ bool Policy(CommandLine &CmdL)
            continue;
 
         // Print the package name and the version we are forcing to
            continue;
 
         // Print the package name and the version we are forcing to

-        cout << "     " << I.Name() << " -> ";
+        cout << "     " << I.FullName(true) << " -> ";

         
         pkgCache::VerIterator V = Plcy.GetMatch(I);
         if (V.end() == true)
         
         pkgCache::VerIterator V = Plcy.GetMatch(I);
         if (V.end() == true)


@@ -1561,28 +1610,43 @@ bool Policy(CommandLine &CmdL)
       
       return true;
    }
       
       return true;
    }

-   
+
+   string const myArch = _config->Find("APT::Architecture");
+   char const * const msgInstalled = _("  Installed: ");
+   char const * const msgCandidate = _("  Candidate: ");
+   short const InstalledLessCandidate =
+               mbstowcs(NULL, msgInstalled, 0) - mbstowcs(NULL, msgCandidate, 0);
+   short const deepInstalled =
+               (InstalledLessCandidate < 0 ? (InstalledLessCandidate*-1) : 0) - 1;
+   short const deepCandidate =
+               (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1;
+

    // Print out detailed information for each package
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
    // Print out detailed information for each package
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {

-      pkgCache::PkgIterator Pkg = Cache.FindPkg(*I);
+      pkgCache::GrpIterator Grp = Cache.FindGrp(*I);
+      pkgCache::PkgIterator Pkg = Grp.FindPkg("any");

       if (Pkg.end() == true)
       {
         _error->Warning(_("Unable to locate package %s"),*I);
         continue;
       }
       if (Pkg.end() == true)
       {
         _error->Warning(_("Unable to locate package %s"),*I);
         continue;
       }

-      
-      cout << Pkg.Name() << ":" << endl;
-      
+
+      for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) {
+      if (strcmp(Pkg.Arch(),"all") == 0)
+        continue;
+
+      cout << Pkg.FullName(true) << ":" << endl;
+

       // Installed version
       // Installed version

-      cout << _("  Installed: ");
+      cout << msgInstalled << OutputInDepth(deepInstalled, " ");

       if (Pkg->CurrentVer == 0)
         cout << _("(none)") << endl;
       else
         cout << Pkg.CurrentVer().VerStr() << endl;
       
       // Candidate Version 
       if (Pkg->CurrentVer == 0)
         cout << _("(none)") << endl;
       else
         cout << Pkg.CurrentVer().VerStr() << endl;
       
       // Candidate Version 

-      cout << _("  Candidate: ");
+      cout << msgCandidate << OutputInDepth(deepCandidate, " ");

       pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg);
       if (V.end() == true)
         cout << _("(none)") << endl;
       pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg);
       if (V.end() == true)
         cout << _("(none)") << endl;


@@ -1616,10 +1680,11 @@ bool Policy(CommandLine &CmdL)
            if (SrcList->FindIndex(VF.File(),Indx) == false &&
                _system->FindIndex(VF.File(),Indx) == false)
               return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
            if (SrcList->FindIndex(VF.File(),Indx) == false &&
                _system->FindIndex(VF.File(),Indx) == false)
               return _error->Error(_("Cache is out of sync, can't x-ref a package file"));

-           printf(_("       %4i %s\n"),Plcy.GetPriority(VF.File()),
+           printf("       %4i %s\n",Plcy.GetPriority(VF.File()),

                   Indx->Describe(true).c_str());
                   Indx->Describe(true).c_str());

-        }       
-      }      
+        }
+      }
+      }

    }
    
    return true;
    }
    
    return true;


@@ -1669,7 +1734,7 @@ bool Madison(CommandLine &CmdL)
                     {
                          if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File())
                          {
                     {
                          if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File())
                          {

-                                   cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | "
+                                   cout << setw(10) << Pkg.FullName(true) << " | " << setw(10) << V.VerStr() << " | "

                                         << (*IF)->Describe(true) << endl;
                          }
                     }
                                         << (*IF)->Describe(true) << endl;
                          }
                     }


@@ -1737,6 +1802,7 @@ bool ShowHelp(CommandLine &Cmd)
       "   unmet - Show unmet dependencies\n"
       "   search - Search the package list for a regex pattern\n"
       "   show - Show a readable record for the package\n"
       "   unmet - Show unmet dependencies\n"
       "   search - Search the package list for a regex pattern\n"
       "   show - Show a readable record for the package\n"

+      "   showauto - Display a list of automatically installed packages\n"

       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
       "   pkgnames - List the names of all packages in the system\n"
       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
       "   pkgnames - List the names of all packages in the system\n"


@@ -1801,6 +1867,7 @@ int main(int argc,const char *argv[])                                     /*{{{*/
                                     {"xvcg",&XVcg},
                                     {"show",&ShowPackage},
                                     {"pkgnames",&ShowPkgNames},
                                     {"xvcg",&XVcg},
                                     {"show",&ShowPackage},
                                     {"pkgnames",&ShowPkgNames},

+                                    {"showauto",&ShowAuto},

                                     {"policy",&Policy},
                                     {"madison",&Madison},
                                     {0,0}};
                                     {"policy",&Policy},
                                     {"madison",&Madison},
                                     {0,0}};