From bd4a14519c453b39333c3218cfdca16eaaa0a450 Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Mon, 23 Nov 2015 18:41:50 -0500 Subject: [PATCH] FetchLatestReleases: just log the error here Since the return value is being ignored by the caller. --- lib/upgrade/upgrade_supported.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/upgrade/upgrade_supported.go b/lib/upgrade/upgrade_supported.go index 35ff2f91..a8c640ea 100644 --- a/lib/upgrade/upgrade_supported.go +++ b/lib/upgrade/upgrade_supported.go @@ -49,20 +49,22 @@ var insecureHTTP = &http.Client{ // FetchLatestReleases returns the latest releases, including prereleases or // not depending on the argument -func FetchLatestReleases(releasesURL, version string) ([]Release, error) { +func FetchLatestReleases(releasesURL, version string) ([]Release) { resp, err := insecureHTTP.Get(releasesURL) if err != nil { - return nil, err + l.Infoln("Couldn't fetch release information:", err) + return nil } if resp.StatusCode > 299 { - return nil, fmt.Errorf("API call returned HTTP error: %s", resp.Status) + l.Infoln("API call returned HTTP error: %s", resp.Status) + return nil } var rels []Release json.NewDecoder(resp.Body).Decode(&rels) resp.Body.Close() - return rels, nil + return rels } type SortByRelease []Release @@ -78,7 +80,7 @@ func (s SortByRelease) Less(i, j int) bool { } func LatestRelease(releasesURL, version string) (Release, error) { - rels, _ := FetchLatestReleases(releasesURL, version) + rels := FetchLatestReleases(releasesURL, version) return SelectLatestRelease(version, rels) }