Return a network failure when FTP downloads fail and --timestamping is used.

diff --git a/NEWS b/NEWS
index 734e366bf90664cf7cc7ad90697a5dfca72b0c52..163937e435c55bafea84ce6da80c13ad289b9f0e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,13 +5,17 @@ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 See the end for copying conditions.
 
 Please send GNU Wget bug reports to <bug-wget@gnu.org>.
+\f
 * Changes in Wget X.Y.Z
 
 ** Now --version and --help work again.
 
 ** Fix a build error on solaris 10 sparc.
 
-** If --timestamping and --continue can be used at the same time.
+** Now --timestamping and --continue work well together.
+
+** Return a network failure when FTP downloads fail and --timestamping
+   is specified.
 
 \f
 * Changes in Wget 1.13.3

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cb3267c909a4ecde97b70f852b7ae4ec5fbfe9e..8eae78fc191671b35d57835cc5c8f6dff4af0999 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-13  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * ftp.c (ftp_retrieve_glob): Propagate correctly the `res' error
+       code.
+
 2011-09-07  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * http.c (gethttp): Don't inhibit arest request if opt.timestamping is

diff --git a/src/ftp.c b/src/ftp.c
index 9e4f3d76bcbc231f4c74402fd00a81c2eed100f9..a586d84952411d32edcf390c0be30d166c330ecd 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -2125,7 +2125,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action)
   if (start)
     {
       /* Just get everything.  */
-      ftp_retrieve_list (u, start, con);
+      res = ftp_retrieve_list (u, start, con);
     }
   else
     {
@@ -2154,8 +2154,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action)
   if (opt.quota && total_downloaded_bytes > opt.quota)
     return QUOTEXC;
   else
-    /* #### Should we return `res' here?  */
-    return RETROK;
+    return res;
 }
 
 /* The wrapper that calls an appropriate routine according to contents