[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     ca5054171ebd47939a451f600d62e762a51b7d27
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 08:52:45 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 08:52:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ca505417

qmerge: report relevant errors on binpkg unpacks

Thanks Peter Stuge for noticing.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qmerge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 73efcb6..e439a7d 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1258,7 +1258,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
                        rd = fread(iobuf, 1, n, tbz2f);
                        if (0 == rd) {
                                if ((err = ferror(tbz2f)) != 0)
-                                       err("reading %s failed: %s", tbz2, 
strerror(errno));
+                                       err("reading %s failed: %s", tbz2, 
strerror(err));
 
                                if (feof(tbz2f))
                                        err("unexpected EOF in %s: corrupted 
binpkg", tbz2);
@@ -1268,7 +1268,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
                                n = fwrite(iobuf + wr, 1, rd - wr, tarpipe);
                                if (n != rd - wr) {
                                        if ((err = ferror(tarpipe)) != 0)
-                                               err("failed to unpack binpkg: 
%s", strerror(errno));
+                                               err("failed to unpack binpkg: 
%s", strerror(err));
 
                                        if (feof(tarpipe))
                                                err("unexpected EOF trying to 
unpack binpkg");