From 8b93bf13774108feaca0d63df9e8f90fbd105a93 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 7 May 2016 02:11:15 +0200 Subject: print cancel message after curl perform returned diff --git a/rhimport/fetcher.go b/rhimport/fetcher.go index b248483..fc75460 100644 --- a/rhimport/fetcher.go +++ b/rhimport/fetcher.go @@ -106,7 +106,6 @@ func curlProgressCallback(dltotal, dlnow, ultotal, ulnow float64, userdata inter } if data.ctx.Cancel != nil && len(data.ctx.Cancel) > 0 { - rhl.Printf("downloading '%s' got canceled", data.ctx.SourceUri) data.res.ResponseCode = http.StatusNoContent data.res.ErrorString = "canceled" return false @@ -157,6 +156,7 @@ func fetchFileCurl(ctx *Context, res *Result, uri *url.URL) (err error) { os.Remove(path.Dir(cbdata.filename)) } if res.ResponseCode == http.StatusNoContent { + rhl.Printf("download of '%s' got canceled", ctx.SourceUri) return nil } if cbdata.writeError != nil { @@ -262,6 +262,7 @@ func fetchFileArchiv(ctx *Context, res *Result, uri *url.URL) (err error) { os.Remove(path.Dir(cbdata.filename)) } if res.ResponseCode == http.StatusNoContent { + rhl.Printf("download of '%s' got canceled", ctx.SourceUri) return nil } if cbdata.writeError != nil { -- cgit v0.10.2