From 5f0ccad882f7d811e4bea2a7b269f32be2fb1bd9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Dec 2004 10:02:47 +0000 Subject: [PATCH 1/1] * if a sign-file download fails, delete the the partial download in "partial/" also --- apt-pkg/acquire-item.cc | 3 +++ po/apt-all.pot | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index f40c6a50d..fcd655f2a 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -392,6 +392,9 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) // mistakenly trusted string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); unlink(Final.c_str()); + Final = _config->FindDir("Dir::State::lists") + "partial/"+ URItoFileName(RealURI); + unlink(Final.c_str()); + // queue a pkgAcqMetaIndex with no sigfile new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, diff --git a/po/apt-all.pot b/po/apt-all.pot index 7d8e9d40f..c57945afa 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2259,31 +2259,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:893 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:896 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:707 +#: apt-pkg/acquire-item.cc:710 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:763 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:796 +#: apt-pkg/acquire-item.cc:799 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:883 +#: apt-pkg/acquire-item.cc:886 msgid "Size mismatch" msgstr "" -- 2.45.2