Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-06-25 07:48:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-06-20 17:05:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-06-25 14:45:49.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 23 19:03:27 UTC 2013 - [email protected] + +- psm-errno.patch: avoid losing errno from failures to unpack archive + +------------------------------------------------------------------- New: ---- psm-errno.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.2ghCrP/_old 2013-06-25 14:45:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2ghCrP/_new 2013-06-25 14:45:50.000000000 +0200 @@ -135,6 +135,7 @@ Patch79: helperenv.diff Patch80: config-guess-sub-update.diff Patch81: debugedit-aarch64.diff +Patch82: psm-errno.patch Patch6464: auto-config-update-aarch64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -224,7 +225,7 @@ %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 +%patch -P 80 -P 81 -P 82 %ifarch aarch64 %patch6464 %endif ++++++ psm-errno.patch ++++++ Index: lib/psm.c =================================================================== --- lib/psm.c +++ lib/psm.c @@ -807,6 +807,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg case PSM_PROCESS: if (psm->goal == PKG_INSTALL) { int fsmrc = 0; + int saved_errno = 0; rpmpsmNotify(psm, RPMCALLBACK_INST_START, 0); /* make sure first progress call gets made */ @@ -826,6 +827,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg fsmrc = rpmfsmRun(FSM_PKGINSTALL, psm->ts, psm->te, psm->fi, payload, psm, NULL, &psm->failedFile); + saved_errno = errno; rpmswAdd(rpmtsOp(psm->ts, RPMTS_OP_UNCOMPRESS), fdOp(payload, FDSTAT_READ)); @@ -843,6 +845,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg rpmpsmNotify(psm, RPMCALLBACK_INST_STOP, psm->total); if (fsmrc) { + errno = saved_errno; rpmlog(RPMLOG_ERR, _("unpacking of archive failed%s%s: %s\n"), (psm->failedFile != NULL ? _(" on file ") : ""), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
