show item ID in Hit, Ign and Err lines as well

Again, consistency is the main sellingpoint here, but this way it is now
also easier to explain that some files move through different stages and
lines are printed for them hence multiple times: That is a bit hard to
believe if the number is changing all the time, but now that it keeps
consistent.

apt-pkg/acquire-item.cc

@@ -405,7 +405,7 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item			/*{{{*/
 // Acquire::Item::Item - Constructor					/*{{{*/
 APT_IGNORE_DEPRECATED_PUSH
 pkgAcquire::Item::Item(pkgAcquire * const Owner) :
-   FileSize(0), PartialSize(0), Mode(0), Complete(false), Local(false),
+   FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
     QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
 {
    Owner->Add(this);

apt-private/acqprogress.cc

@@ -49,6 +49,16 @@ void AcqTextStatus::Start()
    ID = 1;
 }
 									/*}}}*/
+void AcqTextStatus::AssignItemID(pkgAcquire::ItemDesc &Itm)		/*{{{*/
+{
+   /* In theory calling it from Fetch() would be enough, but to be
+      safe we call it from IMSHit and Fail as well.
+      Also, an Item can pass through multiple stages, so ensure
+      that it keeps the same number */
+   if (Itm.Owner->ID == 0)
+      Itm.Owner->ID = ID++;
+}
+									/*}}}*/
 // AcqTextStatus::IMSHit - Called when an item got a HIT response	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -57,9 +67,11 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
+   AssignItemID(Itm);
    clearLastLine();
 
-   out << _("Hit ") << Itm.Description;
+   // TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+   ioprintf(out, _("Hit:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
    out << std::endl;
    Update = true;
 }
@@ -72,15 +84,16 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    Update = true;
    if (Itm.Owner->Complete == true)
       return;
-
-   Itm.Owner->ID = ID++;
+   AssignItemID(Itm);
 
    if (Quiet > 1)
       return;
 
    clearLastLine();
 
-   out << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
+   // TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+   // Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+   ioprintf(out, _("Get:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
    if (Itm.Owner->FileSize != 0)
       out << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    out << std::endl;
@@ -89,9 +102,10 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
 // AcqTextStatus::Done - Completed a download				/*{{{*/
 // ---------------------------------------------------------------------
 /* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &/*Itm*/)
+void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
 {
    Update = true;
+   AssignItemID(Itm);
 }
 									/*}}}*/
 // AcqTextStatus::Fail - Called when an item fails to download		/*{{{*/
@@ -106,19 +120,25 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
 
+   AssignItemID(Itm);
    clearLastLine();
 
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
-      out << _("Ign ") << Itm.Description << std::endl;
+      // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+      // which failed to download, but the error is ignored (compare "Err:")
+      ioprintf(out, _("Ign:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
       if (Itm.Owner->ErrorText.empty() == false &&
 	    _config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == true)
-	 out << "  " << Itm.Owner->ErrorText << std::endl;
+	 out << std::endl << "  " << Itm.Owner->ErrorText;
+      out << std::endl;
    }
    else
    {
-      out << _("Err ") << Itm.Description << std::endl;
-      out << "  " << Itm.Owner->ErrorText << std::endl;
+      // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+      // which failed to download and the error is critical (compare "Ign:")
+      ioprintf(out, _("Err:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
+      out << std::endl << "  " << Itm.Owner->ErrorText << std::endl;
    }
 
    Update = true;

apt-private/acqprogress.h

@@ -23,7 +23,8 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
    unsigned long ID;
    unsigned long Quiet;
 
-   void clearLastLine();
+   APT_HIDDEN void clearLastLine();
+   APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
 
    public:
 

po/apt-all.pot

@@ -1529,19 +1529,23 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:150

po/ar.po

@@ -1555,20 +1555,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "جلب:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "جلب:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "تجاهل"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "تجاهل:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "خطأ"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "خطأ:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ast.po

@@ -1684,20 +1684,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Oxe "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Oxe:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Des:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Des:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/bg.po

@@ -1720,20 +1720,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Поп "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Поп:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Изт:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Изт:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Игн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Игн:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Грш "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Грш:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/bs.po

@@ -1555,19 +1555,19 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
+msgid "Get:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
+msgid "Err:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:150

po/ca.po

@@ -1708,20 +1708,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Obj:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Bai:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Bai:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/cs.po

@@ -1734,20 +1734,24 @@ msgid "Full Text Search"
 msgstr "Fulltextové hledání"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Cíl "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Cíl:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Mám:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Mám:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/cy.po

@@ -1706,20 +1706,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Presennol "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Cyrchu:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Anwybyddu "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Gwall "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/da.po

@@ -1749,20 +1749,24 @@ msgid "Full Text Search"
 msgstr "Fuldtekst-søgning"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Havde "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Havde:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Henter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Henter:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignorerer "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignorerer:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fejl "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fejl:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/de.po

@@ -1810,20 +1810,24 @@ msgid "Full Text Search"
 msgstr "Volltextsuche"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "OK   "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "OK:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Holen: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Holen:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fehl "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fehl:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/dz.po

@@ -1674,20 +1674,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ཨེབ།"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "ཨེབ།:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "ལེན:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "ལེན:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "ཨེལ་ཇི་ཨེན:"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "ཨེལ་ཇི་ཨེན:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "ཨི་ཨར་ཨར།"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "ཨི་ཨར་ཨར།:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/el.po

@@ -1695,20 +1695,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Hit:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Φέρε:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Φέρε:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Αγνόησε "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Αγνόησε:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Σφάλμα "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Σφάλμα:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/es.po

@@ -1820,20 +1820,24 @@ msgid "Full Text Search"
 msgstr "Buscar en todo el texto"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Obj:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Des:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Des:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/eu.po

@@ -1678,20 +1678,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atzituta "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atzituta:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hartu:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hartu:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ez ikusi "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ez ikusi:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/fi.po

@@ -1669,20 +1669,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Löytyi "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Löytyi:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Nouda:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Nouda:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Siv "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Siv:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Vrhe "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Vrhe:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/fr.po

@@ -1774,20 +1774,24 @@ msgid "Full Text Search"
 msgstr "Recherche en texte intégral"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atteint "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atteint:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Réception de : "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Réception de:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Err:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/gl.po

@@ -1706,20 +1706,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Teño "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Teño:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Rcb:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Rcb:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/he.po

@@ -1188,19 +1188,23 @@ msgid ""
 msgstr ""
 
 #: cmdline/acqprogress.cc:55
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: cmdline/acqprogress.cc:79
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
 msgstr ""
 
 #: cmdline/acqprogress.cc:110
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: cmdline/acqprogress.cc:114
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
 msgstr ""
 
 #: cmdline/acqprogress.cc:135

po/hu.po

@@ -1714,20 +1714,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Találat "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Találat:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Letöltés:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Letöltés:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Mellőz "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Mellőz:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Hiba "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Hiba:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/it.po

@@ -1766,21 +1766,24 @@ msgid "Full Text Search"
 msgstr "Ricerca sul testo"
 
 #: apt-private/acqprogress.cc:62
-msgid "Hit "
-msgstr "Trovato "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Trovato:%lu %s"
 
 #: apt-private/acqprogress.cc:83
-msgid "Get:"
-msgstr "Scaricamento di:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Scaricamento di:%lu %s"
 
-# (ndt) questa non so cosa voglia dire
 #: apt-private/acqprogress.cc:113
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:120
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:143
 #, c-format

po/ja.po

@@ -1750,20 +1750,24 @@ msgid "Full Text Search"
 msgstr "全文検索"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ヒット "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "ヒット:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "取得:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "取得:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "無視 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "無視:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "エラー "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "エラー:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/km.po

@@ -1652,20 +1652,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "វាយ​"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "វាយ​:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "យក​ ៖"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "យក​ ៖:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ko.po

@@ -1666,20 +1666,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "기존 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "기존:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "받기:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "받기:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "무시"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "무시:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "오류 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "오류:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ku.po

@@ -1558,20 +1558,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Anîn:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Anîn:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Çewt"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Çewt:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, fuzzy, c-format

po/lt.po

@@ -1577,20 +1577,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Imamas "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Imamas:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Gauti:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Gauti:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignoruotas "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignoruotas:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Klaida "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Klaida:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/mr.po

@@ -1656,20 +1656,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "दाबा"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "दाबा:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "मिळवा:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "मिळवा:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "आय.जी.एन."
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "आय.जी.एन.:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "दोष इ.आर.आर."
+#, c-format
+msgid "Err:%lu %s"
+msgstr "दोष इ.आर.आर.:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/nb.po

@@ -1684,20 +1684,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Funnet "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Funnet:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hent:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hent:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Feil "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Feil:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ne.po

@@ -1652,20 +1652,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "हान्नुहोस्"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "हान्नुहोस्:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "प्राप्त गर्नुहोस्:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "प्राप्त गर्नुहोस्:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/nl.po

@@ -1776,20 +1776,24 @@ msgid "Full Text Search"
 msgstr "Volledige tekst doorzoeken"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Geraakt "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Geraakt:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Ophalen:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Ophalen:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Genegeerd "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Genegeerd:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fout "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fout:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/nn.po

@@ -1668,20 +1668,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Treff "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Treff:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hent:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hent:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Feil "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Feil:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/pl.po

@@ -1749,22 +1749,26 @@ msgstr ""
 
 # Ujednolicono z aptitude
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Stary "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Stary:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Pobieranie:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Pobieranie:%lu %s"
 
 # Wyrównane do Hit i Err.
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign.  "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 # Wyrównane do Hit i Ign.
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Błąd  "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Błąd:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/pt.po

@@ -1718,20 +1718,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Obter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Obter:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/pt_BR.po

@@ -1687,20 +1687,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atingido "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atingido:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Obter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Obter:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ro.po

@@ -1695,20 +1695,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atins "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atins:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Luat:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Luat:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignorat "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignorat:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Eroare"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Eroare:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/ru.po

@@ -1742,20 +1742,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В кэше "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "В кэше:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Получено:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Получено:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Игн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Игн:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Ош  "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Ош:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/sk.po

@@ -1716,20 +1716,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Už existuje "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Už existuje:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Získava sa:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Získava sa:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Chyba "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Chyba:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/sl.po

@@ -1717,20 +1717,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Zadetek "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Zadetek:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Dobi:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Dobi:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Prezr "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Prezr:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Nap "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Nap:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/sv.po

@@ -1698,23 +1698,27 @@ msgstr ""
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bra "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Bra:%lu %s"
 
 # "Get:" = hämtar ny version
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Läs:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Läs:%lu %s"
 
 # "Ign" = hoppar över
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 # "Err" = fel vid hämtning
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fel "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fel:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/th.po

@@ -1696,20 +1696,24 @@ msgid "Full Text Search"
 msgstr "ค้นทั่วทั้งเนื้อความ"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "เจอ "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "เจอ:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "ดึง:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "ดึง:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "ข้าม "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "ข้าม:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "ปัญหา "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "ปัญหา:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/tl.po

@@ -1677,20 +1677,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tumama "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Tumama:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Kunin: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Kunin:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "DiPansin "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "DiPansin:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Err:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/tr.po

@@ -1753,20 +1753,24 @@ msgid "Full Text Search"
 msgstr "Tam Metin Arama"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bağlandı  "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Bağlandı:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Alınıyor: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Alınıyor:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Yoksay    "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Yoksay:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Hata      "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Hata:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/uk.po

@@ -1736,20 +1736,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В кеші "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "В кеші:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Отр:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Отр:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ігн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ігн:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Пом "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Пом:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/vi.po

@@ -1752,20 +1752,24 @@ msgid "Full Text Search"
 msgstr "Tìm kiếm toàn văn"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tìm thấy "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Tìm thấy:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Lấy:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Lấy:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Bỏq "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Bỏq:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Lỗi "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Lỗi:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/zh_CN.po

@@ -1693,20 +1693,24 @@ msgid "Full Text Search"
 msgstr "全文搜索"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "命中:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "获取："
+#, c-format
+msgid "Get:%lu %s"
+msgstr "获取:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "忽略 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "忽略:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "错误 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "错误:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

po/zh_TW.po

@@ -1646,20 +1646,24 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "已有 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "已有:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "下載:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "下載:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "略過 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "略過:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "錯誤 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "錯誤:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format

test/integration/test-apt-acquire-additional-files

@@ -49,8 +49,8 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0 
 'http://localhost:8080/dists/unstable/main/Contents-amd64.bz2' localhost:8080_dists_unstable_main_Contents-amd64 0 " aptget update --print-uris
 
-testsuccessequal "Hit http://localhost:8080 unstable InRelease
-Get:1 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
+Get:2 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
 Reading package lists..." aptget update
 
 testequal 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64' find rootdir/var/lib/apt/lists -name '*Contents*'
@@ -74,8 +74,8 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0 
 'http://localhost:8080/dists/unstable/main/Contents-amd64.gz.bz2' localhost:8080_dists_unstable_main_Contents-amd64.gz 0 " aptget update --print-uris
 
-testsuccessequal "Hit http://localhost:8080 unstable InRelease
-Get:1 http://localhost:8080 unstable/main amd64 Contents.gz [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
+Get:2 http://localhost:8080 unstable/main amd64 Contents.gz [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
 Reading package lists..." aptget update
 
 testequal 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz' find rootdir/var/lib/apt/lists -name '*Contents*'
@@ -89,7 +89,7 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 'http://localhost:8080/dists/unstable/main/binary-amd64/Packages.bz2' localhost:8080_dists_unstable_main_binary-amd64_Packages 0 
 'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0 " aptget update --print-uris
 
-testsuccessequal "Hit http://localhost:8080 unstable InRelease
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
 Reading package lists..." aptget update
 
 testempty find rootdir/var/lib/apt/lists -name '*Contents*'

test/integration/test-apt-cdrom

@@ -136,14 +136,14 @@ aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' &&
 mv rootdir/media/cdrom-unmounted rootdir/media/cdrom-ejected
 msgmsg "ensure an update doesn't mess with cdrom sources"
 testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Hit cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+testfileequal rootdir/tmp/testsuccess.output 'Hit:1 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
 Reading package lists...'
 mv rootdir/media/cdrom-ejected rootdir/media/cdrom-unmounted
 testcdromusage
 
 msgmsg 'and again to check that it withstands the temptation even if it could mount'
 testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Hit cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+testfileequal rootdir/tmp/testsuccess.output 'Hit:1 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
 Reading package lists...'
 testcdromusage
 

test/integration/test-apt-get-update-unauth-warning

@@ -20,9 +20,9 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
-testfailureequal "Ign file:$APTARCHIVE unstable InRelease
+testfailureequal "Ign:1 file:$APTARCHIVE unstable InRelease
   File not found
-Err file:$APTARCHIVE unstable Release
+Err:2 file:$APTARCHIVE unstable Release
   File not found
 W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
 E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories
@@ -36,13 +36,13 @@ filesize() {
 	stat -c%s "$(aptget files --no-release-info --format '$(URI)' "Created-By: $1" | cut -d'/' -f 3- ).gz"
 }
 # allow override
-testwarningequal "Ign file:$APTARCHIVE unstable InRelease
+testwarningequal "Ign:1 file:$APTARCHIVE unstable InRelease
   File not found
-Ign file:$APTARCHIVE unstable Release
+Ign:2 file:$APTARCHIVE unstable Release
   File not found
-Get:1 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
-Get:2 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
-Get:3 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
+Get:3 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
+Get:4 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
+Get:5 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
 Reading package lists...
 W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories
 # ensure we can not install the package

test/integration/test-apt-update-ims

@@ -43,7 +43,7 @@ runtest() {
     testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
     # ensure that we still do a hash check for other files on ims hit of Release
-    if grep -q '^Hit .* InRelease$' expected.output || ! grep -q '^Ign .* Release\(\.gpg\)\?$' expected.output; then
+    if grep -q '^Hit:[0-9]\+ .* InRelease$' expected.output || ! grep -q '^Ign:[0-9]\+ .* Release\(\.gpg\)\?$' expected.output; then
 	    $TEST aptget update -o Debug::Acquire::gpgv=1
 	    cp rootdir/tmp/${TEST}.output goodsign.output
 	    testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
@@ -55,7 +55,7 @@ runtest() {
 }
 
 msgmsg 'InRelease'
-EXPECT='Hit http://localhost:8080 unstable InRelease
+EXPECT='Hit:1 http://localhost:8080 unstable InRelease
 Reading package lists...'
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
@@ -63,9 +63,9 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 
 msgmsg 'Release/Release.gpg'
-EXPECT='Ign http://localhost:8080 unstable InRelease
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
+Hit:2 http://localhost:8080 unstable Release
 Reading package lists...'
 find aptarchive -name 'InRelease' -delete
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
@@ -74,10 +74,10 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 
 msgmsg 'Release only'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
-Ign http://localhost:8080 unstable Release.gpg
+Hit:2 http://localhost:8080 unstable Release
+Ign:3 http://localhost:8080 unstable Release.gpg
   404  Not Found
 Reading package lists...
 W: The data from 'http://localhost:8080 unstable Release' is not signed. Packages from that repository can not be authenticated."
@@ -96,7 +96,7 @@ Valid-Until: $(date -d '-1 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" '{}' \;
 signreleasefiles
 
 msgmsg 'expired InRelease'
-EXPECT='Hit http://localhost:8080 unstable InRelease
+EXPECT='Hit:1 http://localhost:8080 unstable InRelease
 E: Release file for http://localhost:8080/dists/unstable/InRelease is expired (invalid since). Updates for this repository will not be applied.'
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
@@ -104,9 +104,9 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 
 msgmsg 'expired Release/Release.gpg'
-EXPECT='Ign http://localhost:8080 unstable InRelease
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
+Hit:2 http://localhost:8080 unstable Release
 E: Release file for http://localhost:8080/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied.'
 find aptarchive -name 'InRelease' -delete
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
@@ -115,10 +115,10 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 
 msgmsg 'expired Release only'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
-Ign http://localhost:8080 unstable Release.gpg
+Hit:2 http://localhost:8080 unstable Release
+Ign:3 http://localhost:8080 unstable Release.gpg
   404  Not Found
 W: The data from 'http://localhost:8080 unstable Release' is not signed. Packages from that repository can not be authenticated.
 E: Release file for http://localhost:8080/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
@@ -130,13 +130,13 @@ runtest 'failure' 'warning'
 
 
 msgmsg 'no Release at all'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Ign http://localhost:8080 unstable Release
+Ign:2 http://localhost:8080 unstable Release
   404  Not Found
-Hit http://localhost:8080 unstable/main Sources
-Hit http://localhost:8080 unstable/main amd64 Packages
-Hit http://localhost:8080 unstable/main Translation-en
+Hit:3 http://localhost:8080 unstable/main Sources
+Hit:4 http://localhost:8080 unstable/main amd64 Packages
+Hit:5 http://localhost:8080 unstable/main Translation-en
 Reading package lists...
 W: The repository 'http://localhost:8080 unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository."
 find aptarchive -name '*Release*' -delete

test/integration/test-apt-update-not-modified

@@ -20,14 +20,14 @@ methodtest() {
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	# drop an architecture, which means the file should be gone now
 	configarchitecture 'i386'
 	sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
@@ -42,9 +42,9 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main amd64 Packages
+	testfailureequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err:2 $1 unstable/main amd64 Packages
   Hash Sum mismatch
 W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
 
@@ -54,8 +54,8 @@ E: Some index files failed to download. They have been ignored, or old ones used
 	cp -a aptarchive/dists.good aptarchive/dists
 
 	# … now everything is fine again
-	testsuccessequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+	testsuccessequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
@@ -74,18 +74,18 @@ Reading package lists..." aptget update
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+Hit:2 $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	# drop an architecture, which means the file should be gone now
 	configarchitecture 'i386'
 	sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+Hit:2 $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
@@ -100,11 +100,11 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Ign $1 unstable InRelease
+	testfailureequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main amd64 Packages
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err:4 $1 unstable/main amd64 Packages
   Hash Sum mismatch
 W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
 
@@ -115,18 +115,18 @@ E: Some index files failed to download. They have been ignored, or old ones used
 	find aptarchive/dists -name 'InRelease' -delete
 
 	# … now everything is fine again
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	webserverconfig 'aptwebserver::support::modified-since' 'false'
 	webserverconfig 'aptwebserver::support::last-modified' 'false'
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Get:1 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
+Get:2 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
 Reading package lists..." aptget update
 	webserverconfig 'aptwebserver::support::modified-since' 'true'
 	webserverconfig 'aptwebserver::support::last-modified' 'true'

test/integration/test-bug-595691-empty-and-broken-archive-files

@@ -13,7 +13,7 @@ setupflataptarchive
 testaptgetupdate() {
 	rm -rf rootdir/var/lib/apt
 	aptget update >testaptgetupdate.diff 2>&1 || true
-	sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+	sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
 	GIVEN="$1"
 	shift
 	msgtest "Test for correctness of" "apt-get update with $*"
@@ -47,12 +47,12 @@ testoverfile() {
 	forcecompressor "$1"
 
 	createemptyarchive 'Packages'
-	testaptgetupdate "Get: file:$APTARCHIVE  Packages []
+	testaptgetupdate "Get:2 file:$APTARCHIVE  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
 	createemptyfile 'Packages'
-	testaptgetupdate "Get: file:$APTARCHIVE  Packages
-Err file:$APTARCHIVE  Packages
+	testaptgetupdate "Get:2 file:$APTARCHIVE  Packages
+Err:2 file:$APTARCHIVE  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS  Empty files can't be valid archives
 
@@ -63,13 +63,13 @@ testoverhttp() {
 	forcecompressor "$1"
 
 	createemptyarchive 'Packages'
-	testaptgetupdate "Get: http://localhost:8080  Packages []
+	testaptgetupdate "Get:2 http://localhost:8080  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
 	createemptyfile 'Packages'
 	#FIXME: we should response with a good error message instead
-	testaptgetupdate "Get: http://localhost:8080  Packages
-Err http://localhost:8080  Packages
+	testaptgetupdate "Get:2 http://localhost:8080  Packages
+Err:2 http://localhost:8080  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages.${COMPRESS})  Empty files can't be valid archives
 

test/integration/test-bug-602412-dequote-redirect

@@ -21,7 +21,7 @@ testrun() {
 	testsuccess --nomsg aptget update
 
 	# check that I-M-S header is kept in redirections
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 
 	msgtest 'Test redirection works in' 'package download'

test/integration/test-pdiff-usage

@@ -98,7 +98,7 @@ SHA256-Download:
 	msgmsg "Testcase: index is already up-to-date: $*"
 	find rootdir/var/lib/apt/lists -name '*diff_Index' -type f -delete
 	testsuccess aptget update "$@"
-	testequal 'Hit http://localhost:8080  InRelease
+	testequal 'Hit:1 http://localhost:8080  InRelease
 Reading package lists...' aptget update "$@" -o Debug::Acquire::Transaction=0 -o Debug::pkgAcquire::Diffs=0
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt newstuff

test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum

@@ -176,10 +176,10 @@ testmismatch() {
 Building dependency tree...
 Need to get 6 B of source archives.
 Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
-Err http://localhost:8080  $1 1.0 (dsc)
+Err:1 http://localhost:8080  $1 1.0 (dsc)
   Hash Sum mismatch
 Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]
-Err http://localhost:8080  $1 1.0 (tar)
+Err:2 http://localhost:8080  $1 1.0 (tar)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:8080/${1}_1.0.dsc  Hash Sum mismatch
 
@@ -242,7 +242,7 @@ Building dependency tree...
 Need to get 6 B of source archives.
 Get:1 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (tar) [3 B]
 Get:2 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc) [3 B]
-Err http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc)
+Err:2 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc  Hash Sum mismatch
 
@@ -253,7 +253,7 @@ testfailureequal 'Reading package lists...
 Building dependency tree...
 Need to get 6 B of source archives.
 Get:1 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
-Err http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar)
+Err:1 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar)
   Hash Sum mismatch
 Get:2 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (dsc) [3 B]
 E: Failed to fetch http://localhost:8080/pkg-mixed-sha2-bad_1.0.tar.gz  Hash Sum mismatch