From 1a19adf85c02ac5123ad90df30dfce35a53bc84c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 Oct 2014 07:29:58 +0200 Subject: [PATCH] lib/transaction_commit.c: CID 62716 (argument cannot be negative) --- lib/transaction_commit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/transaction_commit.c b/lib/transaction_commit.c index be2a66f3..7f820147 100644 --- a/lib/transaction_commit.c +++ b/lib/transaction_commit.c @@ -152,11 +152,12 @@ download_binpkgs(struct xbps_handle *xhp, xbps_object_iterator_t iter) xbps_set_cb_state(xhp, XBPS_STATE_DOWNLOAD, 0, pkgver, "Downloading `%s' package (from `%s')...", pkgver, repoloc); if ((rv = xbps_fetch_file(xhp, file, NULL)) == -1) { + rv = errno; fetchstr = xbps_fetch_error_string(); xbps_set_cb_state(xhp, XBPS_STATE_DOWNLOAD_FAIL, fetchLastErrCode != 0 ? fetchLastErrCode : errno, pkgver, "[trans] failed to download `%s' package from `%s': %s", - pkgver, repoloc, fetchstr ? fetchstr : strerror(errno)); + pkgver, repoloc, fetchstr ? fetchstr : strerror(rv)); free(file); break; } @@ -173,11 +174,12 @@ download_binpkgs(struct xbps_handle *xhp, xbps_object_iterator_t iter) "Downloading `%s' signature (from `%s')...", pkgver, repoloc); file = xbps_xasprintf("%s/%s.%s.xbps.sig", repoloc, pkgver, arch); if ((rv = xbps_fetch_file(xhp, file, NULL)) == -1) { + rv = errno; fetchstr = xbps_fetch_error_string(); xbps_set_cb_state(xhp, XBPS_STATE_DOWNLOAD_FAIL, fetchLastErrCode != 0 ? fetchLastErrCode : errno, pkgver, "[trans] failed to download `%s' signature from `%s': %s", - pkgver, repoloc, fetchstr ? fetchstr : strerror(errno)); + pkgver, repoloc, fetchstr ? fetchstr : strerror(rv)); free(sigfile); free(file); break;