diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-04-22 15:48:52 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-04-22 15:48:52 +0200 |
| commit | 4a858c3921aabe5253204063bedb2307a60f30e0 (patch) | |
| tree | b4e2eadd764bf2f000347aad133dad178f52defc | |
| parent | 397d56f56b3ffaf38df57571c11f0699e2810902 (diff) | |
| parent | 7730e095a5be67ea86d012fc8c905449c0ae0b37 (diff) | |
* apt-pkg/acquire-item.cc:
- fix signaure removal on transient network failures
(thanks to Scott James Remnant)
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 9464ba696..aee187227 100644 --- 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 f89333d42..f238ef3be 100644 --- 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 eaf33bf5f..3ea59d452 100644 --- 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: |