瀏覽代碼

* if a sign-file download fails, delete the the partial download in "partial/" also

Michael Vogt 21 年之前
父節點
當前提交
5f0ccad882
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 3 0
      apt-pkg/acquire-item.cc
  2. 5 5
      po/apt-all.pot

+ 3 - 0
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,

+ 5 - 5
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 ""