* handle network failures more gracefully (default apt sources spec)

apt-pkg/acquire-item.cc:
- on network failures (Timeout,ResolveFailure,ConnectionRefused) move the
  old (known good) sigfile back and don't touch the indexfiles
cmdline/apt-get.cc:
- don't fail on apt-get update problems but issue a warning instead

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1fa929aad659823994e4f7286df069095ae90ada..dee00c63e7b5e4f554aaa0a6910bbc71de1c7608 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -321,8 +321,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
-   // remove any partial downloaded sig-file. it may confuse proxies
-   // and is too small to warrant a partial download anyway
+   // remove any partial downloaded sig-file in partial/. 
+   // it may confuse proxies and is too small to warrant a 
+   // partial download anyway
    unlink(DestFile.c_str());
 
    // Create the item
@@ -389,17 +390,20 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
                                                                        /*}}}*/
 void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
+   string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
 
    // if we get a network error we fail gracefully
    if(LookupTag(Message,"FailReason") == "Timeout" || 
       LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
       LookupTag(Message,"FailReason") == "ConnectionRefused") {
       Item::Failed(Message,Cnf);
+      // move the sigfile back on network failures (and re-authenticated?)
+      if(FileExists(DestFile))
+        Rename(DestFile,Final);
       return;
    }
 
    // Delete any existing sigfile when the acquire failed
-   string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
    unlink(Final.c_str());
 
    // queue a pkgAcqMetaIndex with no sigfile

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 92051f8ff58a65684a9437f111b9ce1ed64f6294..99a51c9b8a66287afca42ac17fb67dd10f328144 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1381,7 +1381,7 @@ bool DoUpdate(CommandLine &CmdL)
       return false;
    
    if (Failed == true)
-      return _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+      _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
    
    return true;
 }

diff --git a/configure.in b/configure.in
index 2e92bd0a91414b9c5b8de789e54aa5e474c05e0f..6cd00f9deb21a7372aab3c47c0bf6bc8c09d6e91 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.6.43.3ubuntu1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2ubuntu1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 3490fba7cbed1e66c3376d45dbd0f503cc2292c9..8c53d7a5cb024f9e44b949c27253c62892e4833a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.43.3) unstable; urgency=low
+apt (0.6.43.2ubuntu1) dapper; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
   * ca.po: Completed to 512t. Closes: #351592
@@ -26,8 +26,9 @@ apt (0.6.43.3) unstable; urgency=low
   * cmdline/apt-get.cc: only run the list-cleaner if a update was 
     successfull
   * apt-get update errors are only warnings nowdays
+  * be more careful with the signature file on network failures
 
- -- 
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 22:27:48 +0100
 
 apt (0.6.43.2) unstable; urgency=low
 
@@ -54,6 +55,24 @@ apt (0.6.43.2) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
 
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+    - en_GB.po, de.po: fix spaces errors in "Ign " translations
+      Closes: #347258
+    - makefile: make update-po a pre-requisite of clean target so
+               that POT and PO files are always up-to-date
+    - sv.po: Completed to 511t. Closes: #346450
+    - sk.po: Completed to 511t. Closes: #346369
+    - fr.po: Completed to 511t
+    - *.po: Updated from sources (511 strings)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+  * added APT::Periodic::Unattended-Upgrade (requires the package
+    "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
+
 apt (0.6.43.1) unstable; urgency=low
   
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: