Ver código fonte

use the pretty fullname of a pkg as download desciption

Otherwise the "WARNING: The following packages cannot be authenticated!"
messages does not include the architecture of the package, so it would
be slightly misinformative.
David Kalnischkies 12 anos atrás
pai
commit
40f8a8ba8c
1 arquivos alterados com 2 adições e 6 exclusões
  1. 2 6
      apt-pkg/acquire-item.cc

+ 2 - 6
apt-pkg/acquire-item.cc

@@ -1865,7 +1865,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
       _error->Error(_("I wasn't able to locate a file for the %s package. "
       _error->Error(_("I wasn't able to locate a file for the %s package. "
 		      "This might mean you need to manually fix this package. "
 		      "This might mean you need to manually fix this package. "
 		      "(due to missing arch)"),
 		      "(due to missing arch)"),
-		    Version.ParentPkg().Name());
+		    Version.ParentPkg().FullName().c_str());
       return;
       return;
    }
    }
    
    
@@ -1993,7 +1993,7 @@ bool pkgAcqArchive::QueueNext()
       Desc.URI = Index->ArchiveURI(PkgFile);
       Desc.URI = Index->ArchiveURI(PkgFile);
       Desc.Description = Index->ArchiveInfo(Version);
       Desc.Description = Index->ArchiveInfo(Version);
       Desc.Owner = this;
       Desc.Owner = this;
-      Desc.ShortDesc = Version.ParentPkg().Name();
+      Desc.ShortDesc = Version.ParentPkg().FullName(true);
 
 
       // See if we already have the file. (Legacy filenames)
       // See if we already have the file. (Legacy filenames)
       FileSize = Version->Size;
       FileSize = Version->Size;
@@ -2060,10 +2060,6 @@ bool pkgAcqArchive::QueueNext()
 
 
       // Create the item
       // Create the item
       Local = false;
       Local = false;
-      Desc.URI = Index->ArchiveURI(PkgFile);
-      Desc.Description = Index->ArchiveInfo(Version);
-      Desc.Owner = this;
-      Desc.ShortDesc = Version.ParentPkg().Name();
       QueueURI(Desc);
       QueueURI(Desc);
 
 
       ++Vf;
       ++Vf;