summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2011-05-30 14:14:11 +0200
committerJulian Andres Klode <jak@debian.org>2011-05-30 14:14:11 +0200
commit4fdb612374655361c8923a4611db6a0d10054317 (patch)
tree4f700ae465eb6c065dfba405741c1ab800e06f11 /apt-pkg
parent0901c5d08eadea5b5d91b09d4f532a029cb42574 (diff)
Reject files known to be invalid (LP: #346386) (Closes: #627642)
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 6df915d8e..998c42dc4 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -271,7 +271,7 @@ void pkgAcqSubIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{{
string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI);
- /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #195301) */
+ /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */
indexRecords SubIndexParser;
if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) {
Status = StatError;
@@ -904,7 +904,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
}
/* Verify the index file for correctness (all indexes must
- * have a Package field) (LP: #346386) (Closes: #195301) */
+ * have a Package field) (LP: #346386) (Closes: #627642) */
{
FileFd fd(DestFile, FileFd::ReadOnly);
pkgTagSection sec;
@@ -1360,7 +1360,7 @@ void pkgAcqMetaIndex::AuthDone(string Message) /*{{{*/
void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/
{
#if 0
- /* Reject invalid, existing Release files (LP: #346386) (Closes: #195301)
+ /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642)
* FIXME: Disabled; it breaks unsigned repositories without hashes */
if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile))
{
@@ -1533,7 +1533,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
RunScripts("APT::Update::Auth-Failure");
return;
} else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
- /* Invalid signature file, reject (LP: #346386) (Closes: #195301) */
+ /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */
_error->Error(_("GPG error: %s: %s"),
Desc.Description.c_str(),
LookupTag(Message,"Message").c_str());