[gentoo-commits] proj/portage:multilib commit in: /

[Thomas Sachau]

commit:     e2085b63a9063d3a548347ec37f0a8448e6d35e7
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 11:33:54 2022 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:33:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2085b63

Merge tag 'portage-3.0.28' into multilib

portage-3.0.28

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 RELEASE-NOTES                                    |  4 +++
 bin/phase-functions.sh                           |  2 +-
 lib/portage/package/ebuild/prepare_build_dirs.py | 35 ++++++++----------------
 setup.py                                         |  2 +-
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --cc bin/phase-functions.sh
index 4b8adb82c,d3221993d..f549832e4
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -319,9 -294,9 +319,9 @@@ __dyn_clean() 
                        "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
                        "$PORTAGE_BUILDDIR"/.exit_status
  
 -              rm -rf "${PORTAGE_BUILDDIR}/build-info"
 +              rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
                rm -rf "${WORKDIR}"
-               rm -rf "${PORTAGE_BUILDDIR}/files"
+               rm -f "${PORTAGE_BUILDDIR}/files"
        fi
  
        if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then