From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FB9D138334 for ; Wed, 31 Oct 2018 16:47:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00655E0A6A; Wed, 31 Oct 2018 16:47:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C139BE0A6A for ; Wed, 31 Oct 2018 16:47:04 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 44AEA335C7F; Wed, 31 Oct 2018 16:47:01 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH] misc-functions.sh: Inline and reflow __prepall Date: Wed, 31 Oct 2018 17:46:56 +0100 Message-Id: <20181031164656.11931-1-mgorny@gentoo.org> X-Mailer: git-send-email 2.19.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: b535f857-0e10-482d-98bb-bc9fc2698ed3 X-Archives-Hash: 583efb062c8d9a5674706569ea19f0fc Inline the __prepall function into install_qa_check(), and reflow it to cover the code more correctly. The arbitrary split between these functions has resulted in mismatches, with e.g. prepstrip being covered by mtree flag saving but dostrip being accidentally omitted. Signed-off-by: Michał Górny --- bin/misc-functions.sh | 48 ++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index ff3d2a1ff..db7aaed5a 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -43,30 +43,6 @@ install_symlink_html_docs() { fi } -__prepall() { - if has chflags $FEATURES ; then - # Save all the file flags for restoration at the end of prepall. - mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree" - # Remove all the file flags so that prepall can do anything necessary. - chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}" - chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null - fi - - [[ -d ${ED%/}/usr/share/info ]] && prepinfo - - # Apply compression. - "${PORTAGE_BIN_PATH}"/ecompress --queue "${PORTAGE_DOCOMPRESS[@]}" - "${PORTAGE_BIN_PATH}"/ecompress --ignore "${PORTAGE_DOCOMPRESS_SKIP[@]}" - "${PORTAGE_BIN_PATH}"/ecompress --dequeue - - ___eapi_has_dostrip || prepallstrip - - if has chflags $FEATURES ; then - # Restore all the file flags that were saved at the beginning of prepall. - mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null - fi -} - install_qa_check() { local d f i qa_var x paths qa_checks=() checks_run=() if ! ___eapi_has_prefix_variables; then @@ -123,13 +99,33 @@ install_qa_check() { ) done < <(printf "%s\0" "${qa_checks[@]}" | LC_ALL=C sort -u -z) - export STRIP_MASK - __prepall + if has chflags $FEATURES ; then + # Save all the file flags for restoration afterwards. + mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree" + # Remove all the file flags so that we can do anything necessary. + chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}" + chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null + fi + + [[ -d ${ED%/}/usr/share/info ]] && prepinfo + + # Apply compression. + "${PORTAGE_BIN_PATH}"/ecompress --queue "${PORTAGE_DOCOMPRESS[@]}" + "${PORTAGE_BIN_PATH}"/ecompress --ignore "${PORTAGE_DOCOMPRESS_SKIP[@]}" + "${PORTAGE_BIN_PATH}"/ecompress --dequeue + export STRIP_MASK if ___eapi_has_dostrip; then "${PORTAGE_BIN_PATH}"/estrip --queue "${PORTAGE_DOSTRIP[@]}" "${PORTAGE_BIN_PATH}"/estrip --ignore "${PORTAGE_DOSTRIP_SKIP[@]}" "${PORTAGE_BIN_PATH}"/estrip --dequeue + else + prepallstrip + fi + + if has chflags $FEATURES ; then + # Restore all the file flags that were saved earlier on. + mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null fi # Create NEEDED.ELF.2 regardless of RESTRICT=binchecks, since this info is -- 2.19.1