From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 18 Sep 2013 10:20:52 +0000 (+0100)
Subject: Fix curl return codes.
X-Git-Tag: 0.2~23
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=bb4a32c13b7a0b6f3148cff075c7b9176ce14020;p=goaljobs.git

Fix curl return codes.
---

diff --git a/goaljobs.ml b/goaljobs.ml
index b5981ad..2dc0541 100644
--- a/goaljobs.ml
+++ b/goaljobs.ml
@@ -187,9 +187,10 @@ let url_exists url =
     sprintf "curl --output /dev/null --silent --head --fail %s" (quote url) in
   match Sys.command cmd with
   | 0 -> true
-  | 1 -> false
+  | 19|22 -> false
   | r ->
-    let msg = sprintf "curl error testing '%s' (exit code %d)" url r in
+    let msg = sprintf "curl error testing '%s': exit code %d, see curl(1)"
+      url r in
     goal_failed msg
 
 let file_contains_string filename str =
@@ -208,11 +209,12 @@ let url_contains_string url str =
     sprintf "curl --output %s --silent --fail %s" (quote tmp) (quote url) in
   (match Sys.command cmd with
   | 0 -> ()
-  | 1 ->
+  | 19|22 ->
     let msg = sprintf "curl failed to download URL '%s'" url in
     goal_failed msg
   | r ->
-    let msg = sprintf "curl error testing '%s' (exit code %d)" url r in
+    let msg = sprintf "curl error testing '%s': exit code %d, see curl(1)"
+      url r in
     goal_failed msg
   );
   let r = file_contains_string tmp str in