From 4fdb612374655361c8923a4611db6a0d10054317 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Mon, 30 May 2011 14:14:11 +0200
Subject: Reject files known to be invalid (LP: #346386) (Closes: #627642)

---
 apt-pkg/acquire-item.cc | 8 ++++----
 debian/changelog        | 2 +-
 2 files changed, 5 insertions(+), 5 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());
diff --git a/debian/changelog b/debian/changelog
index b1d276d5d..d02091f54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ apt (0.8.15) UNRELEASED; urgency=low
     - Really release action groups only once (Closes: #622744)
     - Make purge work again for config-files (LP: #244598) (Closes: #150831)
   * apt-pkg/acquire-item.cc:
-    - Reject files known to be invalid (LP: #346386) (Closes: #195301)
+    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
   * debian/apt.cron.daily:
     - Check power after wait, patch by manuel-soto (LP: #705269)
   * debian/control:
-- 
cgit v1.2.3