From 25a53eb4dc7a6b11a856159fb7e32e9a5977e802 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Tue, 20 Dec 2016 21:14:00 +0100
Subject: [PATCH] Raise an error if 'refresh' does not download anything
 successfully.

---
 src/nimble.nim | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/nimble.nim b/src/nimble.nim
index 30ae15d..73a5de7 100644
--- a/src/nimble.nim
+++ b/src/nimble.nim
@@ -59,6 +59,8 @@ proc refresh(options: Options) =
 
   proc downloadList(list: PackageList, options: Options) =
     display("Downloading", list.name & " package list", priority = HighPriority)
+
+    var lastError = ""
     for i in 0 .. <list.urls.len:
       let url = list.urls[i]
       display("Trying", url)
@@ -75,21 +77,25 @@ proc refresh(options: Options) =
       try:
         downloadFile(url, tempPath, proxy = getProxy(options))
       except:
-        if i == <list.urls.len:
-          raise
         let message = "Could not download: " & getCurrentExceptionMsg()
         display("Warning", message, Warning)
+        lastError = message
         continue
 
       if not validatePackagesList(tempPath):
-        let message = "Downloaded packages.json file is invalid, discarding."
-        display("Warning", message, Warning)
+        lastError = "Downloaded packages.json file is invalid"
+        display("Warning", lastError & ", discarding.", Warning)
         continue
+
       copyFile(tempPath,
           options.getNimbleDir() / "packages_$1.json" % list.name.toLowerAscii())
       display("Success", "Package list downloaded.", Success, HighPriority)
+      lastError = ""
       break
 
+    if lastError.len != 0:
+      raise newException(NimbleError, "Refresh failed\n" & lastError)
+
   if parameter.len > 0:
     if parameter.isUrl:
       let cmdLine = PackageList(name: "commandline", urls: @[parameter])
@@ -1004,7 +1010,7 @@ proc doAction(options: Options) =
     discard execHook(options, false)
 
 when isMainModule:
-  let error = ""
+  var error = ""
   when defined(release):
     try:
       parseCmdLine().doAction()