From a235ddf86a9cc5c3a8fade9084044229ff51a77f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 16 Apr 2011 11:02:47 +0200 Subject: apt-pkg/acquire-item.cc: Only try to rename existing Release files (Closes: #622912) --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1d651ba69..7b120d3ce 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1504,7 +1504,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /* Always move the meta index, even if gpgv failed. This ensures * that PackageFile objects are correctly filled in */ - { + if (FileExists(DestFile)) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); /* InRelease files become Release files, otherwise -- cgit v1.2.3-70-g09d2 From ab60fb67a9917bfb8cb96576d6452f1ec9d34e0d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 18 Apr 2011 10:56:37 +0200 Subject: apt-pkg/depcache.cc: Really release action groups only once (Closes: #622744) --- apt-pkg/depcache.cc | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 07803d7bf..9dad7e240 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -70,7 +70,7 @@ void pkgDepCache::ActionGroup::release() cache.MarkAndSweep(); } - released = false; + released = true; } } diff --git a/debian/changelog b/debian/changelog index ff5b0c439..3f9874bcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.8.14.2) UNRELEASED; urgency=low + + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + + -- Julian Andres Klode Mon, 18 Apr 2011 10:54:11 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: -- cgit v1.2.3-70-g09d2