warning: cast from type A to type B casts away qualifiers [-Wcast-qual]

[apt.git] / apt-private / private-show.cc

diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index cee1328430cf215454667734289d66ed95c3a52d..0a69debbf8498f4996fa0f68ae80ca6c1461497e 100644 (file)
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -54,6 +54,15 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
    if (I.IsOk() == false)
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
 
    if (I.IsOk() == false)
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
 

+   // find matching sources.list metaindex
+   pkgSourceList *SrcList = CacheFile.GetSourceList();
+   pkgIndexFile *Index;
+   if (SrcList->FindIndex(I, Index) == false &&
+       _system->FindIndex(I, Index) == false)
+      return _error->Error("Can not find indexfile for Package %s (%s)", 
+                           V.ParentPkg().Name(), V.VerStr());
+   std::string source_index_file = Index->Describe(true);
+

    // Read the record
    FileFd PkgF;
    if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)
    // Read the record
    FileFd PkgF;
    if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)


@@ -67,12 +76,12 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
    // make size nice
    std::string installed_size;
    if (Tags.FindI("Installed-Size") > 0)
    // make size nice
    std::string installed_size;
    if (Tags.FindI("Installed-Size") > 0)

-      installed_size = SizeToStr(Tags.FindI("Installed-Size")*1024);
+      strprintf(installed_size, "%sB", SizeToStr(Tags.FindI("Installed-Size")*1024).c_str());

    else
       installed_size = _("unknown");
    std::string package_size;
    if (Tags.FindI("Size") > 0)
    else
       installed_size = _("unknown");
    std::string package_size;
    if (Tags.FindI("Size") > 0)

-      package_size = SizeToStr(Tags.FindI("Size"));
+      strprintf(package_size, "%sB", SizeToStr(Tags.FindI("Size")).c_str());

    else
       package_size = _("unknown");
 
    else
       package_size = _("unknown");
 


@@ -83,16 +92,27 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
       manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no";
    else
       manual_installed = 0;
       manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no";
    else
       manual_installed = 0;

-   std::string suite = GetArchiveSuite(CacheFile, V);
+
+   // FIXME: add verbose that does not do the removal of the tags?

    TFRewriteData RW[] = {
    TFRewriteData RW[] = {

-      {"Conffiles",0},
-      {"Description",0},
-      {"Description-md5",0},
-      {"Installed-Size", installed_size.c_str(), 0},
+      // delete, apt-cache show has this info and most users do not care
+      {"MD5sum", NULL, NULL},
+      {"SHA1", NULL, NULL},
+      {"SHA256", NULL, NULL},
+      {"Filename", NULL, NULL},
+      {"Multi-Arch", NULL, NULL},
+      {"Architecture", NULL, NULL},
+      {"Conffiles", NULL, NULL},
+      // we use the translated description
+      {"Description", NULL, NULL},
+      {"Description-md5", NULL, NULL},
+      // improve
+      {"Installed-Size", installed_size.c_str(), NULL},

       {"Size", package_size.c_str(), "Download-Size"},
       {"Size", package_size.c_str(), "Download-Size"},

-      {"Archive-Origin", suite.c_str(), 0},
-      {"Manual-Installed", manual_installed, 0},
-      {}
+      // add
+      {"APT-Manual-Installed", manual_installed, NULL},
+      {"APT-Sources", source_index_file.c_str(), NULL},
+      {NULL, NULL, NULL}

    };
 
    if(TFRewrite(stdout, Tags, NULL, RW) == false)
    };
 
    if(TFRewrite(stdout, Tags, NULL, RW) == false)


@@ -128,8 +148,9 @@ bool ShowPackage(CommandLine &CmdL)                                 /*{{{*/
    if (select == APT::VersionList::CANDIDATE)
    {
       APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper);
    if (select == APT::VersionList::CANDIDATE)
    {
       APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper);

-      if (verset_all.size() > verset.size())
-         _error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size());
+      int const records = verset_all.size() - verset.size();
+      if (records > 0)
+         _error->Notice(P_("There is %i additional record. Please use the '-a' switch to see it", "There are %i additional records. Please use the '-a' switch to see them.", records), records);

    }
 
    for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();
    }
 
    for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();