show progress info while 'downloading' a local .deb file

Showing just "Get: [1234 B]" looks very strange, so we now print the
filename and as usual the package name, version and architecture.

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 32ccd75291fe212503d114e04958a3ef3d5f678a..793882e67a6d6d827e091517c4160fbafba49a5a 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -249,7 +249,14 @@ pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const
 
    return File;
 }
 
    return File;
 }

-
+std::string debDebPkgFileIndex::ArchiveInfo_impl(pkgCache::VerIterator const &Ver) const
+{
+   std::string Res = IndexFileName() + " ";
+   Res.append(Ver.ParentPkg().Name()).append(" ");
+   Res.append(Ver.Arch()).append(" ");
+   Res.append(Ver.VerStr());
+   return Res;
+}

                                                                        /*}}}*/
 // DscFile Index - a single .dsc file as an index                      /*{{{*/
 debDscFileIndex::debDscFileIndex(std::string const &DscFile)
                                                                        /*}}}*/
 // DscFile Index - a single .dsc file as an index                      /*{{{*/
 debDscFileIndex::debDscFileIndex(std::string const &DscFile)

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 5bec4f2ea8b96ca66c0f1e48a1e8b6311c57a854..e96a4761eed6430f7906393465a70afadeb7b4d5 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -144,6 +144,9 @@ public:
 
    debDebPkgFileIndex(std::string const &DebFile);
    virtual ~debDebPkgFileIndex();
 
    debDebPkgFileIndex(std::string const &DebFile);
    virtual ~debDebPkgFileIndex();

+
+   //FIXME: use proper virtual-handling on next ABI break
+   APT_HIDDEN std::string ArchiveInfo_impl(pkgCache::VerIterator const &Ver) const;

 };
 
 class debDscFileIndex : public pkgDebianIndexRealFile
 };
 
 class debDscFileIndex : public pkgDebianIndexRealFile

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index f57b442a3205f2a5fc017901225a6fa0f6f2983a..34ebcb2b8bf8703d8f8731e722488319de687170 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -21,9 +21,10 @@
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/progress.h>

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

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

-#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/debindexfile.h>

 
 #include <sys/stat.h>
 
 
 #include <sys/stat.h>
 


@@ -66,8 +67,11 @@ pkgIndexFile::pkgIndexFile(bool const Trusted) :                     /*{{{*/
 }
                                                                        /*}}}*/
 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/
 }
                                                                        /*}}}*/
 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/

-std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &/*Ver*/) const
+std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator const &Ver) const

 {
 {

+   debDebPkgFileIndex const * const debfile = dynamic_cast<debDebPkgFileIndex const*>(this);
+   if (debfile != nullptr)
+      return debfile->ArchiveInfo_impl(Ver);

    return std::string();
 }
                                                                        /*}}}*/
    return std::string();
 }
                                                                        /*}}}*/