diff options
author | David Kalnischkies <david@kalnischkies.de> | 2016-03-12 17:36:01 +0100 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2016-04-25 15:35:52 +0200 |
commit | 3f7604340855760289d7ed7e2dca70f99a9f4986 (patch) | |
tree | 851adc9f599aec50c60689e1a892ea3000cc2b23 | |
parent | 82153438235144c485a8539b5c035e67bbef96e4 (diff) |
drop empty line from fetch error
This is a duplicate of sorts of 0efb29eb36184bbe6de7b1013d1898796d94b171
which is the a lot more frequent case of this error – and also a
duplicate of this error message, just without the \n at the end.
Git-Dch: Ignore
-rw-r--r-- | apt-private/private-download.cc | 2 | ||||
-rw-r--r-- | po/apt-all.pot | 9 | ||||
-rw-r--r-- | po/ar.po | 14 | ||||
-rw-r--r-- | po/ast.po | 14 | ||||
-rw-r--r-- | po/bg.po | 14 | ||||
-rw-r--r-- | po/bs.po | 13 | ||||
-rw-r--r-- | po/ca.po | 14 | ||||
-rw-r--r-- | po/cs.po | 11 | ||||
-rw-r--r-- | po/cy.po | 11 | ||||
-rw-r--r-- | po/da.po | 11 | ||||
-rw-r--r-- | po/de.po | 11 | ||||
-rw-r--r-- | po/dz.po | 11 | ||||
-rw-r--r-- | po/el.po | 11 | ||||
-rw-r--r-- | po/es.po | 11 | ||||
-rw-r--r-- | po/eu.po | 11 | ||||
-rw-r--r-- | po/fi.po | 11 | ||||
-rw-r--r-- | po/fr.po | 11 | ||||
-rw-r--r-- | po/gl.po | 11 | ||||
-rw-r--r-- | po/he.po | 4 | ||||
-rw-r--r-- | po/hu.po | 13 | ||||
-rw-r--r-- | po/it.po | 11 | ||||
-rw-r--r-- | po/ja.po | 11 | ||||
-rw-r--r-- | po/km.po | 11 | ||||
-rw-r--r-- | po/ko.po | 11 | ||||
-rw-r--r-- | po/ku.po | 11 | ||||
-rw-r--r-- | po/lt.po | 11 | ||||
-rw-r--r-- | po/mr.po | 11 | ||||
-rw-r--r-- | po/nb.po | 11 | ||||
-rw-r--r-- | po/ne.po | 11 | ||||
-rw-r--r-- | po/nl.po | 11 | ||||
-rw-r--r-- | po/nn.po | 11 | ||||
-rw-r--r-- | po/pl.po | 11 | ||||
-rw-r--r-- | po/pt.po | 11 | ||||
-rw-r--r-- | po/pt_BR.po | 11 | ||||
-rw-r--r-- | po/ro.po | 11 | ||||
-rw-r--r-- | po/ru.po | 11 | ||||
-rw-r--r-- | po/sk.po | 11 | ||||
-rw-r--r-- | po/sl.po | 11 | ||||
-rw-r--r-- | po/sv.po | 11 | ||||
-rw-r--r-- | po/th.po | 11 | ||||
-rw-r--r-- | po/tl.po | 11 | ||||
-rw-r--r-- | po/tr.po | 11 | ||||
-rw-r--r-- | po/uk.po | 11 | ||||
-rw-r--r-- | po/vi.po | 11 | ||||
-rw-r--r-- | po/zh_CN.po | 11 | ||||
-rw-r--r-- | po/zh_TW.po | 11 | ||||
-rwxr-xr-x | test/integration/test-apt-get-changelog | 8 | ||||
-rwxr-xr-x | test/integration/test-apt-helper | 2 | ||||
-rwxr-xr-x | test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum | 6 |
49 files changed, 152 insertions, 368 deletions
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index 89d0a50c7..1ae0f4a0e 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -109,7 +109,7 @@ bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failu uri.User.clear(); uri.Password.clear(); std::string descUri = std::string(uri); - _error->Error(_("Failed to fetch %s %s\n"), descUri.c_str(), + _error->Error(_("Failed to fetch %s %s"), descUri.c_str(), (*I)->ErrorText.c_str()); if (Failure != NULL) diff --git a/po/apt-all.pot b/po/apt-all.pot index a29c65a7d..0b3760793 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -220,9 +220,9 @@ msgid "" "unauthenticated" msgstr "" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" +msgid "Failed to fetch %s %s" msgstr "" #: apt-private/private-download.cc @@ -3494,11 +3494,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -228,10 +228,10 @@ msgid "" "unauthenticated" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "فشل إحضار %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "فشل إحضار %s %s" #: apt-private/private-download.cc #, c-format @@ -3556,11 +3556,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "فشل إحضار %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3570,6 +3565,9 @@ msgstr "" msgid "Calculating upgrade" msgstr "حساب الترقية" +#~ msgid "Failed to fetch %s %s\n" +#~ msgstr "فشل إحضار %s %s\n" + #, fuzzy #~ msgid "The repository is insufficiently signed by key %s (%s)" #~ msgstr "المسار %s طويل جداً" @@ -227,10 +227,10 @@ msgid "" "unauthenticated" msgstr "Hai problemes y utilizose -y ensin --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Falló algamar %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Falló algamar %s %s" #: apt-private/private-download.cc #, c-format @@ -3707,11 +3707,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Falló algamar %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3724,6 +3719,9 @@ msgstr "" msgid "Calculating upgrade" msgstr "Calculando l'anovamientu" +#~ msgid "Failed to fetch %s %s\n" +#~ msgstr "Falló algamar %s %s\n" + #, fuzzy #~ msgid "The repository is insufficiently signed by key %s (%s)" #~ msgstr "El direutorio %s ta desviáu" @@ -237,10 +237,10 @@ msgid "" "unauthenticated" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Неуспех при изтеглянето на %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Неуспех при изтеглянето на %s %s" #: apt-private/private-download.cc #, c-format @@ -3752,11 +3752,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Неуспех при изтеглянето на %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3772,6 +3767,9 @@ msgstr "Изчисляване на актуализацията" #~ msgid "The repository is insufficiently signed by key %s (%s)" #~ msgstr "Директорията %s е отклонена" +#~ msgid "Failed to fetch %s %s\n" +#~ msgstr "Неуспех при изтеглянето на %s %s\n" + #~ msgid "" #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " #~ "packages" @@ -224,10 +224,10 @@ msgid "" "unauthenticated" msgstr "" -#: apt-private/private-download.cc -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "" +#: apt-private/private-download.cc apt-pkg/update.cc +#, fuzzy, c-format +msgid "Failed to fetch %s %s" +msgstr "Ne mogu otvoriti %s" #: apt-private/private-download.cc #, c-format @@ -3539,11 +3539,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Ne mogu otvoriti %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -232,10 +232,10 @@ msgid "" "unauthenticated" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "No s'ha pogut obtenir %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "No s'ha pogut obtenir %s %s" #: apt-private/private-download.cc #, c-format @@ -3754,11 +3754,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "No s'ha pogut obtenir %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3774,6 +3769,9 @@ msgstr "S'està calculant l'actualització" #~ msgid "The repository is insufficiently signed by key %s (%s)" #~ msgstr "El directori %s està desviat" +#~ msgid "Failed to fetch %s %s\n" +#~ msgstr "No s'ha pogut obtenir %s %s\n" + #~ msgid "" #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " #~ "packages" @@ -231,10 +231,10 @@ msgid "" msgstr "" "Vyskytly se neověřené balíky a -y bylo použito bez --allow-unauthenticated." -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Selhalo stažení %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Selhalo stažení %s %s" #: apt-private/private-download.cc #, c-format @@ -3707,11 +3707,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "Nelze převést %s na celé číslo (integer)" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "Selhalo stažení %s %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -232,10 +232,10 @@ msgid "" "unauthenticated" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Methwyd cyrchu %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Methwyd cyrchu %s %s" #: apt-private/private-download.cc #, fuzzy, c-format @@ -3738,11 +3738,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Methwyd cyrchu %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Kunne ikke hente %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Kunne ikke hente %s %s" #: apt-private/private-download.cc #, c-format @@ -3722,11 +3722,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Kunne ikke hente %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Fehlschlag beim Holen von %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Fehlschlag beim Holen von %s %s" #: apt-private/private-download.cc #, c-format @@ -3832,11 +3832,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Fehlschlag beim Holen von %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -233,10 +233,10 @@ msgid "" "unauthenticated" msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" +msgid "Failed to fetch %s %s" +msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" #: apt-private/private-download.cc #, c-format @@ -3681,11 +3681,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -243,10 +243,10 @@ msgid "" "unauthenticated" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Αποτυχία ανάκτησης του %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Αποτυχία ανάκτησης του %s %s" #: apt-private/private-download.cc #, c-format @@ -3710,11 +3710,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Αποτυχία ανάκτησης του %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -295,10 +295,10 @@ msgid "" msgstr "" "Había paquetes sin autenticar y se utilizó -y sin --allow-unauthenticated" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Fallo al obtener %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Fallo al obtener %s %s" #: apt-private/private-download.cc #, c-format @@ -3892,11 +3892,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "No se pudo convertir %s a entero: fuera de rango" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "Fallo al obtener %s %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ezin da lortu %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Ezin da lortu %s %s" #: apt-private/private-download.cc #, c-format @@ -3677,11 +3677,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Ezin da lortu %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Tiedoston %s nouto ei onnistunut %s\n" +msgid "Failed to fetch %s %s" +msgstr "Tiedoston %s nouto ei onnistunut %s" #: apt-private/private-download.cc #, c-format @@ -3669,11 +3669,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Tiedoston %s nouto ei onnistunut %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -235,10 +235,10 @@ msgid "" "unauthenticated" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Impossible de récupérer %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Impossible de récupérer %s %s" #: apt-private/private-download.cc #, c-format @@ -3816,11 +3816,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Impossible de récupérer %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Xurdiron problemas e empregouse -y sen --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Non foi posíbel obter %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Non foi posíbel obter %s %s" #: apt-private/private-download.cc #, c-format @@ -3745,11 +3745,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Non foi posíbel obter %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -779,8 +779,8 @@ msgstr "האם אתה רוצה להמשיך? [Y/n]" #: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "כשלון בהבאת %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "כשלון בהבאת %s %s" #: cmdline/apt-get.cc:1011 msgid "Some files failed to download" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2016-04-25 15:24+0200\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" -"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n" +"Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n" "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n" "Language: hu\n" "MIME-Version: 1.0\n" @@ -238,10 +238,10 @@ msgstr "" "Hitelesítetlen csomagok vannak, és a -y kapcsolót használta\n" "a --allow-unauthenticated nélkül." -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Sikertelen letöltés: %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Sikertelen letöltés: %s %s" #: apt-private/private-download.cc #, c-format @@ -3788,11 +3788,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "%s nem alakítható egésszé: kívül esik a tartományon" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "Sikertelen letöltés: %s %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -233,10 +233,10 @@ msgid "" "unauthenticated" msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Impossibile recuperare %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Impossibile recuperare %s %s" #: apt-private/private-download.cc #, c-format @@ -3793,11 +3793,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Impossibile recuperare %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -244,10 +244,10 @@ msgstr "" "認証されていないパッケージがあり、-y オプションが --allow-unauthenticated な" "しで使用されました" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s の取得に失敗しました %s\n" +msgid "Failed to fetch %s %s" +msgstr "%s の取得に失敗しました %s" #: apt-private/private-download.cc #, c-format @@ -3781,11 +3781,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "%s を整数に変換できません: 範囲外" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "%s の取得に失敗しました %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -235,10 +235,10 @@ msgid "" "unauthenticated" msgstr "មានបញ្ហា ហើយ -y ត្រូវបានប្រើដោយគ្មាន --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s" #: apt-private/private-download.cc #, c-format @@ -3651,11 +3651,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -228,10 +228,10 @@ msgid "" "unauthenticated" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s 파일을 받는데 실패했습니다 %s\n" +msgid "Failed to fetch %s %s" +msgstr "%s 파일을 받는데 실패했습니다 %s" #: apt-private/private-download.cc #, c-format @@ -3665,11 +3665,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "%s 파일을 받는데 실패했습니다 %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -226,10 +226,10 @@ msgid "" "unauthenticated" msgstr "" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Anîna %s %s biserneket\n" +msgid "Failed to fetch %s %s" +msgstr "Anîna %s %s biserneket" #: apt-private/private-download.cc #, c-format @@ -3552,11 +3552,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Anîna %s %s biserneket\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Nepavyko parsiųsti %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Nepavyko parsiųsti %s %s" #: apt-private/private-download.cc #, c-format @@ -3643,11 +3643,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Nepavyko parsiųsti %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s आणणे असफल\n" +msgid "Failed to fetch %s %s" +msgstr "%s %s आणणे असफल" #: apt-private/private-download.cc #, c-format @@ -3653,11 +3653,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "%s %s आणणे असफल\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Klarte ikke å skaffe %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Klarte ikke å skaffe %s %s" #: apt-private/private-download.cc #, c-format @@ -3704,11 +3704,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Klarte ikke å skaffe %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s तान्न असफल भयो\n" +msgid "Failed to fetch %s %s" +msgstr "%s %s तान्न असफल भयो" #: apt-private/private-download.cc #, c-format @@ -3650,11 +3650,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "%s %s तान्न असफल भयो\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -246,10 +246,10 @@ msgstr "" "Er waren niet-geauthenticeerde pakketten en -y was gebruikt zonder --allow-" "unauthenticated" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ophalen van %s is mislukt %s\n" +msgid "Failed to fetch %s %s" +msgstr "Ophalen van %s is mislukt %s" #: apt-private/private-download.cc #, c-format @@ -3846,11 +3846,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "Kan %s niet naar een geheel getal omzetten: buiten het bereik" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "Ophalen van %s is mislukt %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Klarte ikkje henta %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Klarte ikkje henta %s %s" #: apt-private/private-download.cc #, fuzzy, c-format @@ -3666,11 +3666,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Klarte ikkje henta %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -240,10 +240,10 @@ msgid "" "unauthenticated" msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Nie udało się pobrać %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Nie udało się pobrać %s %s" #: apt-private/private-download.cc #, c-format @@ -3779,11 +3779,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Nie udało się pobrać %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -232,10 +232,10 @@ msgid "" "unauthenticated" msgstr "Há problemas e foi utilizado -y sem --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Falhou obter %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Falhou obter %s %s" #: apt-private/private-download.cc #, c-format @@ -3760,11 +3760,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Falhou obter %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." diff --git a/po/pt_BR.po b/po/pt_BR.po index 5df404352..72999ca98 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -231,10 +231,10 @@ msgid "" "unauthenticated" msgstr "Há problemas e -y foi usado sem --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Falhou ao buscar %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Falhou ao buscar %s %s" #: apt-private/private-download.cc #, c-format @@ -3695,11 +3695,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Falhou ao buscar %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -232,10 +232,10 @@ msgid "" "unauthenticated" msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Eșec la aducerea lui %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Eșec la aducerea lui %s %s" #: apt-private/private-download.cc #, c-format @@ -3710,11 +3710,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Eșec la aducerea lui %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -240,10 +240,10 @@ msgid "" "unauthenticated" msgstr "Существуют проблемы, а параметр -y указан без --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Не удалось получить %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Не удалось получить %s %s" #: apt-private/private-download.cc #, c-format @@ -3780,11 +3780,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Не удалось получить %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -233,10 +233,10 @@ msgid "" "unauthenticated" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Zlyhalo stiahnutie %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Zlyhalo stiahnutie %s %s" #: apt-private/private-download.cc #, c-format @@ -3720,11 +3720,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Zlyhalo stiahnutie %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -233,10 +233,10 @@ msgid "" "unauthenticated" msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ni mogoče dobiti %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Ni mogoče dobiti %s %s" #: apt-private/private-download.cc #, c-format @@ -3725,11 +3725,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Ni mogoče dobiti %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Problem har uppstått och -y användes utan --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Misslyckades med att hämta %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Misslyckades med att hämta %s %s" #: apt-private/private-download.cc #, c-format @@ -3754,11 +3754,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Misslyckades med att hämta %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -229,10 +229,10 @@ msgid "" "unauthenticated" msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "ไม่สามารถดาวน์โหลด %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "ไม่สามารถดาวน์โหลด %s %s" #: apt-private/private-download.cc #, c-format @@ -3640,11 +3640,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "ไม่สามารถดาวน์โหลด %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -235,10 +235,10 @@ msgid "" "unauthenticated" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Bigo sa pagkuha ng %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Bigo sa pagkuha ng %s %s" #: apt-private/private-download.cc #, c-format @@ -3689,11 +3689,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Bigo sa pagkuha ng %s %s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -240,10 +240,10 @@ msgstr "" "Aslına uygunluğu doğrulanamayan paketler var ve -y seçeneği --allow-" "unauthenticated olmadan kullanılmış" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s ağdan alınamadı. %s\n" +msgid "Failed to fetch %s %s" +msgstr "%s alınamadı %s" #: apt-private/private-download.cc #, c-format @@ -3749,11 +3749,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "%s metni tam sayıya dönüştürülemiyor" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "%s alınamadı %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -240,10 +240,10 @@ msgid "" "unauthenticated" msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Не вдалося завантажити %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Не вдалося завантажити %s %s" #: apt-private/private-download.cc #, c-format @@ -3779,11 +3779,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Не вдалося завантажити %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -234,10 +234,10 @@ msgid "" "unauthenticated" msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Gặp lỗi khi lấy về %s %s\n" +msgid "Failed to fetch %s %s" +msgstr "Gặp lỗi khi lấy về %s %s" #: apt-private/private-download.cc #, c-format @@ -3750,11 +3750,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "Gặp lỗi khi lấy về %s %s\n" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." diff --git a/po/zh_CN.po b/po/zh_CN.po index 0e3634fdf..a1fc57f42 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -235,10 +235,10 @@ msgid "" msgstr "" "存在未认证的软件包同时使用了 -y 选项,然而未搭配 --allow-unauthenticated" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "下载 %s %s 失败\n" +msgid "Failed to fetch %s %s" +msgstr "无法下载 %s %s" #: apt-private/private-download.cc #, c-format @@ -3647,11 +3647,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "无法将 %s 转换为整数:超出范围" #: apt-pkg/update.cc -#, c-format -msgid "Failed to fetch %s %s" -msgstr "无法下载 %s %s" - -#: apt-pkg/update.cc msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." diff --git a/po/zh_TW.po b/po/zh_TW.po index 173a75ec0..582c297d6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -230,10 +230,10 @@ msgid "" "unauthenticated" msgstr "發生了問題,且 -y 並沒有和 --force-yes 搭配使用" -#: apt-private/private-download.cc +#: apt-private/private-download.cc apt-pkg/update.cc #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "無法取得 %s,%s\n" +msgid "Failed to fetch %s %s" +msgstr "無法取得 %s,%s" #: apt-private/private-download.cc #, c-format @@ -3633,11 +3633,6 @@ msgid "Cannot convert %s to integer: out of range" msgstr "" #: apt-pkg/update.cc -#, fuzzy, c-format -msgid "Failed to fetch %s %s" -msgstr "無法取得 %s,%s\n" - -#: apt-pkg/update.cc #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index 1815b9961..0812db500 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -106,12 +106,12 @@ testequal 'bogus1.0) stable; urgency=low' head -n 1 foo.changelog rm -f foo.changelog # no @CHANGEPATH@ in the URI -testequal 'E: Failed to fetch changelog:/foo.changelog Changelog unavailable for foo=1.0 -' aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/change.txt" +testequal 'E: Failed to fetch changelog:/foo.changelog Changelog unavailable for foo=1.0' \ + aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/change.txt" testfailure test -e foo.changelog -testequal "E: Failed to fetch http://localhost:${APTHTTPPORT}/does/not/exist/main/f/foo/foo_1.0/change.txt Changelog unavailable for foo=1.0 (404 Not Found) -" aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/does/not/exist/@CHANGEPATH@/change.txt" +testequal "E: Failed to fetch http://localhost:${APTHTTPPORT}/does/not/exist/main/f/foo/foo_1.0/change.txt Changelog unavailable for foo=1.0 (404 Not Found)" \ + aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/does/not/exist/@CHANGEPATH@/change.txt" testfailure test -e foo.changelog testdpkgnotinstalled 'foo' diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper index b2347ddcf..bc7f6e680 100755 --- a/test/integration/test-apt-helper +++ b/test/integration/test-apt-helper @@ -34,14 +34,12 @@ test_apt_helper_download() { msgtest 'apt-file download-file' 'wrong md5sum' testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo5' 'MD5Sum:aabbcc' testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo Hash Sum mismatch - E: Download Failed" testfileequal ./downloaded/foo5.FAILED 'foo' msgtest 'apt-file download-file' 'wrong sha256' testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo6' 'SHA256:aabbcc' testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo Hash Sum mismatch - E: Download Failed" testfileequal './downloaded/foo6.FAILED' 'foo' 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 b37ca456f..2a271607e 100755 --- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum +++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum @@ -221,9 +221,7 @@ Get:2 http://localhost:${APTHTTPPORT} $1 1.0 (tar) [4 B] Err:2 http://localhost:${APTHTTPPORT} $1 1.0 (tar) Hash Sum mismatch E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc Writing more data than expected (3 > 2) - E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz Hash Sum mismatch - E: Failed to fetch some archives." else FAILURE="Reading package lists... @@ -235,13 +233,10 @@ Get:2 http://localhost:${APTHTTPPORT} $1 1.0 (tar) [3 B] Err:2 http://localhost:${APTHTTPPORT} $1 1.0 (tar) Hash Sum mismatch E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc Hash Sum mismatch - E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz Hash Sum mismatch - E: Failed to fetch some archives." fi testfailureequal "$FAILURE" aptget source -d "$@" - msgtest 'Files were not download as they have hashsum mismatches for' "$1" testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz @@ -317,7 +312,6 @@ Get:1 http://localhost:${APTHTTPPORT} pkg-mixed-sha2-bad 1.0 (tar) [3 B] Err:1 http://localhost:${APTHTTPPORT} pkg-mixed-sha2-bad 1.0 (tar) Hash Sum mismatch E: Failed to fetch http://localhost:${APTHTTPPORT}/pkg-mixed-sha2-bad_1.0.tar.gz Hash Sum mismatch - E: Failed to fetch some archives." aptget source -d pkg-mixed-sha2-bad # it gets even more pathologic: multiple entries for one file, some even disagreeing! |