* apt-pkg/acquire-item.cc:

  - fix signaure removal on transient network failures
    (thanks to Scott James Remnant)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 9464ba6961db18f353161e6feffc47d69d283239..aee1872273dafb472449ad821f52aa281d9cf817 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -896,7 +896,7 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    {
       Item::Failed(Message,Cnf);
       // move the sigfile back on transient network failures 
-      if(FileExists(DestFile))
+      if(FileExists(LastGoodSig))
         Rename(LastGoodSig,Final);
 
       // set the status back to , Item::Failed likes to reset it

diff --git a/configure.in b/configure.in
index f89333d427a8d529d2a6183a90d716ac9ab5f19e..f238ef3beeabb421237628a171dc5619aaf33563 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu15")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu17")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index eaf33bf5f0ae1c453cdcba6015eb0982930f307e..3ea59d452c8a4eb9c9dfa9b89d9213ce8a10004d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.9ubuntu17) hardy; urgency=low
+
+  * apt-pkg/acquire-item.cc:
+    - fix signaure removal on transient network failures 
+      (thanks to Scott James Remnant)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Apr 2008 15:32:49 +0200
+
 apt (0.7.9ubuntu16) hardy; urgency=low
 
   * cmdline/apt-key: