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 */
 
    /* 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
       string FinalFile = _config->FindDir("Dir::State::lists");
       FinalFile += URItoFileName(RealURI);
       /* InRelease files become Release files, otherwise

diff --git a/debian/changelog b/debian/changelog
index c2e2dc70dfdae2378c8fa53ed22d7fae0d293d57..857630dc630aac6cb444164e8b416ca8d2b904af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.14.1) UNRELEASED; 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 11:00:19 +0200
+

 apt (0.8.14) unstable; urgency=low
 
   [ Julian Andres Klode ]
 apt (0.8.14) unstable; urgency=low
 
   [ Julian Andres Klode ]