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.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 50936b627da579a1caddec73e6f24c4acd058ec4..5460280ec8387856a866b2717aadb584e858c53b 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/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);

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index 0c606e48e85b823c9d9e03310f1242070b726115..dc92e3b2a139985bd1e2932e33973a1b2de26f5c 100644 (file)
--- a/apt-private/acqprogress.cc
+++ b/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;

diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index 7cf990c65a5ee3eb2534351e9cbaa91ba92b5df0..cbb06fbecc424a0f03593841264980621279c5f0 100644 (file)
--- a/apt-private/acqprogress.h
+++ b/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:
 

diff --git a/po/apt-all.pot b/po/apt-all.pot
index b68d801ead72e5e5ffac5f7a8b02e9991394d1d2..73b033876fe269657e65a2393556ad3553d982b3 100644 (file)
--- a/po/apt-all.pot
+++ b/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

diff --git a/po/ar.po b/po/ar.po
index e2b179d0e577eccd7094a7a8ece1847293ea3428..3e71fef800ef3927c5cdce513e7415ac1331a6c0 100644 (file)
--- a/po/ar.po
+++ b/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

diff --git a/po/ast.po b/po/ast.po
index 1efbbc1d23be7fa3c988a224e70d9495c68c1bb6..1995c12f6ea418da0c6df692135c28c40864ac4b 100644 (file)
--- a/po/ast.po
+++ b/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

diff --git a/po/bg.po b/po/bg.po
index bbe6df3ae67bf5ce30dc628d2ca99b9133cc708c..7dff005e642e8d1149fd8c61358739dffa356aea 100644 (file)
--- a/po/bg.po
+++ b/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

diff --git a/po/bs.po b/po/bs.po
index 9cd1adc85b742bd33c5f0d2ad2f707327a6592f5..abb9a570a59526c8998ccccd31fb6e710c8621dd 100644 (file)
--- a/po/bs.po
+++ b/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

diff --git a/po/ca.po b/po/ca.po
index cdb3ceeb8c7f1207334e8add82852d2807e038c6..065ad0ea7c3dcd6706e1d6d4851160d2587561b3 100644 (file)
--- a/po/ca.po
+++ b/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

diff --git a/po/cs.po b/po/cs.po
index 76fc37b6b971a3745320cb4a4495d1f83a31d943..3f6bcb4a76f3e73d9b57e2bda2750e46da35a55d 100644 (file)
--- a/po/cs.po
+++ b/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

diff --git a/po/cy.po b/po/cy.po
index e29221cd14deaf143d1c0929607e2e1708f43ea3..b05bc7c59dd7feaf16a3a5fccf44cf4a235ce6c0 100644 (file)
--- a/po/cy.po
+++ b/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

diff --git a/po/da.po b/po/da.po
index 53d3de05998f57082d1207d19c9bcde0b5403d24..d6b8e07a1d377b90627ef6b65b282b3f59f0c5f9 100644 (file)
--- a/po/da.po
+++ b/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

diff --git a/po/de.po b/po/de.po
index 85b0cb7acb461b8a469dedeaa9a14ae1e7c6c03f..d4ca0d5a0c21d41e398438e8b9fa2f53c592079b 100644 (file)
--- a/po/de.po
+++ b/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

diff --git a/po/dz.po b/po/dz.po
index 8d1e57b35ccf26bedd042fed44824d6812f5c703..a4c50d2452d56b97fba681f79fc0903e35978ba8 100644 (file)
--- a/po/dz.po
+++ b/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

diff --git a/po/el.po b/po/el.po
index e0750b61e60101741558ea5bf4e4f1414d44ba13..98e1f31c9b40c4dfa57361b4b9045ef71994d068 100644 (file)
--- a/po/el.po
+++ b/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

diff --git a/po/es.po b/po/es.po
index e094ccafa8e1d8a109a0f41a0d478c0b0a846578..a2a9a71e9e248e8a5f2de00e49fccb0a156b2eac 100644 (file)
--- a/po/es.po
+++ b/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

diff --git a/po/eu.po b/po/eu.po
index e268f60599f0b6a0e49749b45680e3bb91a0fa07..f1e90411a34555ce90fb0938645959f18a3ce224 100644 (file)
--- a/po/eu.po
+++ b/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

diff --git a/po/fi.po b/po/fi.po
index d58fb9b041e62070714bd5d66c9ae49af314c79c..c40ed8e9e1d3dfca35592941522341ace3b0d202 100644 (file)
--- a/po/fi.po
+++ b/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

diff --git a/po/fr.po b/po/fr.po
index cb9d82856025429938f284a67aaa05138056d7d5..ecb752f5e966c1f544e5d5f2262f89a32184f26b 100644 (file)
--- a/po/fr.po
+++ b/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

diff --git a/po/gl.po b/po/gl.po
index d6bb1e92eaa9ea335c6b0b4a04a771330360112b..2adaa302a406ed6953cad078d9d8ec834e5363c2 100644 (file)
--- a/po/gl.po
+++ b/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

diff --git a/po/he.po b/po/he.po
index b3ef8f8310d09b0bd5bc7442c840b01741296280..ab7b50745479c2fb65fb3b5770b4b3d80dae4bed 100644 (file)
--- a/po/he.po
+++ b/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

diff --git a/po/hu.po b/po/hu.po
index 313f3a492e664a8eb09b1d7deade66cf1a553019..635184c75e808b661a58bb974db642ac4a62107c 100644 (file)
--- a/po/hu.po
+++ b/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

diff --git a/po/it.po b/po/it.po
index 36173e92c06e2b4d4694529403a179e20e0e2243..178754c52ad6e3bc3bf862598ce467a808f133cd 100644 (file)
--- a/po/it.po
+++ b/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

diff --git a/po/ja.po b/po/ja.po
index 6c49f2608e9d6e327f8d95f05ae9d3c6098a87e0..f8f55f8aaae34aef501f0cffd2a7c182a5599d97 100644 (file)
--- a/po/ja.po
+++ b/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

diff --git a/po/km.po b/po/km.po
index 26bfe43615d65889b42102432a764ab9797d63b4..8c72865f8d250e5bb183b90a14a8c422ed5cc8b5 100644 (file)
--- a/po/km.po
+++ b/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

diff --git a/po/ko.po b/po/ko.po
index 5479ab7904fe978e9b9e142262f4b396f32b3d06..51cc27d612ada2277bb8402faa0298054b340f82 100644 (file)
--- a/po/ko.po
+++ b/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

diff --git a/po/ku.po b/po/ku.po
index c14ca94bd60da1273d60d6146a67a9f4e77aaea1..540307937c87c4f27a22eb3cb23f4275a6677998 100644 (file)
--- a/po/ku.po
+++ b/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

diff --git a/po/lt.po b/po/lt.po
index b85a0fbe1247ceecdd0189187cf9c5c383685507..1f485b28d0e1f53764dc84006e3f89dada35c823 100644 (file)
--- a/po/lt.po
+++ b/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

diff --git a/po/mr.po b/po/mr.po
index 286c5d859c0cb456c45567fbc85d71c895b3cc22..24e470cef1ebf64f106b9fd3a566027f2f2c1e73 100644 (file)
--- a/po/mr.po
+++ b/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

diff --git a/po/nb.po b/po/nb.po
index 07247be4fb32a72e54b5dc4230f3f43d1577dba6..433e339096dd4cc6f709020f2f2ec4ea1d94ebd4 100644 (file)
--- a/po/nb.po
+++ b/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

diff --git a/po/ne.po b/po/ne.po
index 54dd771b46f69b8f12589f801cb81516273fa06c..4c6f2d098fa5a5c1a502059336702e4b387ad6d9 100644 (file)
--- a/po/ne.po
+++ b/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

diff --git a/po/nl.po b/po/nl.po
index 8d226dfef29ba85deddeaad161046239783a17e0..5c774fe8dd1e542253e20c11ff4324985af6946b 100644 (file)
--- a/po/nl.po
+++ b/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

diff --git a/po/nn.po b/po/nn.po
index b3622b6cdbbe4039379ab7a8f74cf3d1e184da8c..0886c266a4dde40bdd037359853118b94c482102 100644 (file)
--- a/po/nn.po
+++ b/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

diff --git a/po/pl.po b/po/pl.po
index 0dda22a475a864afc07fefb98e4ae8c2fca760a1..1851fa805f165edcec9c892624131c7f51cd9444 100644 (file)
--- a/po/pl.po
+++ b/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

diff --git a/po/pt.po b/po/pt.po
index a4b1105f88bf510aee89643eebf313b719844c7c..4f05ada8206b6999f6875f29ab3fb83115c8c954 100644 (file)
--- a/po/pt.po
+++ b/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

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c4d92d027d4133fefb44a2e2223accfd3d5b67e..5e2abd9883205797beec5e7a326407a52eabd84f 100644 (file)
--- a/po/pt_BR.po
+++ b/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

diff --git a/po/ro.po b/po/ro.po
index 63df026ab33a7e176b100e981ef9bdc5e6675b19..9b0a1494a44cd2b5687c66f9944d6aff582ee1fc 100644 (file)
--- a/po/ro.po
+++ b/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

diff --git a/po/ru.po b/po/ru.po
index 260bdd513a94ef1bd4e0aa02d4cea34b9fd2e2a5..2028e542041afbe87b312564d908c55b0c12cce9 100644 (file)
--- a/po/ru.po
+++ b/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

diff --git a/po/sk.po b/po/sk.po
index 912d1fcf77cdcfda2f0c08685a0210e0863a45c0..631ddd8261a78be1ac264e8b99064cf0816299f8 100644 (file)
--- a/po/sk.po
+++ b/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

diff --git a/po/sl.po b/po/sl.po
index 3210fa504e667d978d465dd347e0921c962b998c..845fe3c5f5c3523b9d4900edb307fe51e03f6989 100644 (file)
--- a/po/sl.po
+++ b/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

diff --git a/po/sv.po b/po/sv.po
index 70f4b2d2d7206e3210a4ee0f97b3652b1dd36662..52f65b5986b817b4e0b7949e7e53f88c77e10d58 100644 (file)
--- a/po/sv.po
+++ b/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

diff --git a/po/th.po b/po/th.po
index 147c3b8b83c57b5f40e5481f8317a2328f16affc..60a468ea4d5c6fcfe777937ecd95c9ba5cb57256 100644 (file)
--- a/po/th.po
+++ b/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

diff --git a/po/tl.po b/po/tl.po
index e3da79c8af15bdcca570b4e0b8e3804f2aaaa289..970b0b387c5866c93d48d4af0d120d31a5ff18c2 100644 (file)
--- a/po/tl.po
+++ b/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

diff --git a/po/tr.po b/po/tr.po
index 5d9c3cee3214311a415ecffddd85dd10eb61c796..1e6f38903adea65e054e711f6f803671e7448c0b 100644 (file)
--- a/po/tr.po
+++ b/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

diff --git a/po/uk.po b/po/uk.po
index faeedf9413fd55d382654df8027b1297dca5ab05..47976d39cbbb7d5a9b39db458ae82bf7b293ff67 100644 (file)
--- a/po/uk.po
+++ b/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

diff --git a/po/vi.po b/po/vi.po
index 089d8461a3253c6c9f1f1a2aeda3b4991a65de98..2edb52f224c83eeec4b3e73294ef3195420326c3 100644 (file)
--- a/po/vi.po
+++ b/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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ff5bcf01760f39e42789784dcf5fd11672a3c13..6e9610ac99115a40309275f79d8699efbcd6ff11 100644 (file)
--- a/po/zh_CN.po
+++ b/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

diff --git a/po/zh_TW.po b/po/zh_TW.po
index e35910df2f9ab30d63645b1a53d5d9a9321e044a..201d9d675a7092e1e62f438ef75a7ca35a7936a8 100644 (file)
--- a/po/zh_TW.po
+++ b/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

diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index ffb9f3135525a001c89af9d5aa42b91f651590f7..3465c0a1631e4e28a3f25293241f6f068e8647ae 100755 (executable)
--- a/test/integration/test-apt-acquire-additional-files
+++ b/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*'

diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 6a218ffb848656354263f9dae8256e02eaaab33e..108805daadfd9eb9aad8d6174919109512d0f310 100755 (executable)
--- a/test/integration/test-apt-cdrom
+++ b/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
 

diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 1f4a14e23d7c17fb413485d8fb93562915cf45fc..5b81d56d29e34683a3c04557f21c46c0d79bdae6 100755 (executable)
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/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

diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 7385e701a023b8abf38d88e55d2c1e1845006c6f..2b662171c722eccaa540c2f55b4d7142927e6005 100755 (executable)
--- a/test/integration/test-apt-update-ims
+++ b/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

diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
index 32818658fc6048f5da086c35859f37fad14feac1..6d176a6557415d88e278c2ef1e1007bb50f41542 100755 (executable)
--- a/test/integration/test-apt-update-not-modified
+++ b/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'

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 3042d116d5211821c3b0a2d08f19539b270119b4..47dd62712be29c144615276495afade3d6c85db6 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/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
 

diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index ca2378c196deab1b99164ff70e37d16c46e6d9c8..b9d232f90bd608668ab40df84bd24e8c23b12e0d 100755 (executable)
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/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'

diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 3295d549752e69dfa33cfb89c0bbc23ed581b93b..e5fe21e0f9d328141450ed9533503226deb2742a 100755 (executable)
--- a/test/integration/test-pdiff-usage
+++ b/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

diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
index 6abb5d12a99d7035d3d05b68ae4f6908ffbd8ba9..48a7f0562e74c79e4a3004826aae298749289722 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/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