merge with debian-sid branch and 0.8.14.1 release

* apt-pkg/depcache.cc:
  - Really release action groups only once (Closes: #622744)
* apt-pkg/acquire-item.cc:
  - Only try to rename existing Release files (Closes: #622912)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1d651ba69e5ac3b2f3346655fc2ecfa0023227bf..7b120d3ce5d20cbd324aef877e1ad32dfc586f7c 100644 (file)
--- 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

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index dc4a65bc19e5d544d64f5c9661b50d4451ec141b..474313a0d386d565388b6c6b5896353ce81575f4 100644 (file)
--- 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 9eae2d94e9950e740c1cd8469123063eeb54b233..762688386ef05d99c1015e3c737e3daa7afd1ea0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-apt (0.8.14.1) unstable; urgency=low
+apt (0.8.14.2) UNRELEASED; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/depcache.cc:
+    - Really release action groups only once (Closes: #622744)
 
   [ David Kalnischkies ]
   * fix a bunch of cppcheck warnings/errors based on a patch by
@@ -22,6 +26,13 @@ apt (0.8.14.1) unstable; urgency=low
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 19 Apr 2011 20:57:52 +0200
 
+apt (0.8.14.1) unstable; urgency=low
+
+  * apt-pkg/acquire-item.cc:
+    - Only try to rename existing Release files (Closes: #622912)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 16 Apr 2011 14:36:10 +0200
+
 apt (0.8.14) unstable; urgency=low
 
   [ Julian Andres Klode ]