summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-04-17 15:31:29 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-04-17 15:31:29 +0200
commit17ff0930e92423954b8fb4377755de7c66f097cd (patch)
treef8659a853c68e1d07afd7af1932c4259ad31ca77
parent9fda8ed498f56d8e158134818301b1ef11334c1c (diff)
* apt-pkg/acquire-item.cc:
- if decompression of a index fails, delete the index
-rw-r--r--apt-pkg/acquire-item.cc9
-rw-r--r--debian/changelog4
2 files changed, 11 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 8ec4ba2c0..f566b16b8 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -183,6 +183,7 @@ string pkgAcqIndex::Custom600Headers()
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
+
// no .bz2 found, retry with .gz
if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {
Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
@@ -194,9 +195,15 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Complete = false;
Dequeue();
return;
+ }
+
+ // on decompression failure, remove bad versions in partial/
+ if(Decompression && Erase) {
+ string s = _config->FindDir("Dir::State::lists") + "partial/";
+ s += URItoFileName(RealURI);
+ unlink(s.c_str());
}
-
Item::Failed(Message,Cnf);
}
diff --git a/debian/changelog b/debian/changelog
index 9f34fd793..1786bdfb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.46.5) UNRELEASED; urgency=low
+apt (0.6.47) UNRELEASED; urgency=low
* apt-pkg/algorithm.cc:
- use clog for all debugging
@@ -16,6 +16,8 @@ apt (0.6.46.5) UNRELEASED; urgency=low
- only umount if it was mounted by the method before
* po/gl.po:
- fix error translation that causes trouble to lsb_release
+ * apt-pkg/acquire-item.cc:
+ - if decompression of a index fails, delete the index
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100