From f4e2e2aab989f6d1bbc553a8af7efbe82f5d146b Mon Sep 17 00:00:00 2001
From: ekatek <ekate@meteor.com>
Date: Tue, 24 Mar 2015 14:37:25 -0700
Subject: [PATCH] Better error display in package-client

Addressing: https://github.com/meteor/meteor/issues/3977

HttpHelpers.getUrl sometimes throws an error, and sometimes throws a string. The right
thing to do is to fix getUrl everywhere, but for now, let's get better error handling
in package-client.js
---
 tools/package-client.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/package-client.js b/tools/package-client.js
index 12c39b27d2..552a440fa7 100644
--- a/tools/package-client.js
+++ b/tools/package-client.js
@@ -328,7 +328,8 @@ var uploadFile = function (putUrl, filepath) {
       bodyStreamLength: size
     });
   } catch (err) {
-    buildmessage.error(err.error.toString());
+    // XXX: getUrl's error handling is terrible and we should fix it there.
+    buildmessage.error(typeof err === "string" ? err : err.error.toString());
     return false;
   } finally {
     rs.close();