Merge 6cb0ffe3a0 into e8e3d1bbfc

DepotDownloader/ContentDownloader.cs

@@ -878,7 +878,7 @@ namespace DepotDownloader
                                 break;
                             }
 
-                            Console.WriteLine("Encountered error downloading depot manifest {0} {1}: {2}", depot.DepotId, depot.ManifestId, e.StatusCode);
+                            Console.WriteLine("Encountered {2} for depot manifest {0} {1}. Retrying.", depot.DepotId, depot.ManifestId, e.StatusCode);
                         }
                         catch (OperationCanceledException)
                         {
@@ -887,7 +887,7 @@ namespace DepotDownloader
                         catch (Exception e)
                         {
                             cdnPool.ReturnBrokenConnection(connection);
-                            Console.WriteLine("Encountered error downloading manifest for depot {0} {1}: {2}", depot.DepotId, depot.ManifestId, e.Message);
+                            Console.WriteLine("Error downloading manifest for depot {0} {1}: {2} Retrying.", depot.DepotId, depot.ManifestId, e.Message);
                         }
                     } while (newManifest == null);
 
@@ -1302,7 +1302,7 @@ namespace DepotDownloader
                             break;
                         }
 
-                        Console.WriteLine("Encountered error downloading chunk {0}: {1}", chunkID, e.StatusCode);
+                        Console.WriteLine("Encountered {1} for chunk {0}. Retrying.", chunkID, e.StatusCode);
                     }
                     catch (OperationCanceledException)
                     {
@@ -1311,7 +1311,7 @@ namespace DepotDownloader
                     catch (Exception e)
                     {
                         cdnPool.ReturnBrokenConnection(connection);
-                        Console.WriteLine("Encountered unexpected error downloading chunk {0}: {1}", chunkID, e.Message);
+                        Console.WriteLine("Error downloading chunk {0}: {1} Retrying.", chunkID, e.Message);
                     }
                 } while (written == 0);