[PATCH] misc-functions: Prefix fixes
Fabian Groffen <[email protected]> Mon, 25 Jul 2022 18:47:02 +0200
| Newsgroups | gmane.linux.gentoo.portage.devel |
|---|---|
| Organization | Gentoo Foundation, Inc. |
| Message-ID | <Yt7JBsaCpcmD/[email protected]> |
--PhI0NNT5cSwQ5Qx9 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable bin/misc-functions.sh: some Prefix fixes - ED needs not to exist, whereas D does, so ensure we check for that, and create ED if absent, necessary for further checks to succeed - use EPREFIX in INSTALL_MASK Signed-off-by: Fabian Groffen <[email protected]> diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index c8bac08e7..8fcc23588 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -19,6 +19,8 @@ source "${PORTAGE_BIN_PATH}/ebuild.sh" || exit 1 install_symlink_html_docs() { if ! ___eapi_has_prefix_variables; then local ED=3D${D} + else + [[ ! -d ${ED} && -d ${D} ]] && dodir / fi cd "${ED}" || die "cd failed" # Symlink the html documentation (if DOC_SYMLINKS_DIR is set in make.conf) @@ -83,7 +87,7 @@ install_qa_check() { local EPREFIX=3D ED=3D${D} fi =20 - cd "${ED}" || die "cd failed" + cd "${D}" || die "cd failed" =20 # Collect the paths for QA checks, highest prio first. paths=3D( @@ -367,7 +718,7 @@ preinst_mask() { local f x for f in man info doc; do if has no${f} ${FEATURES}; then - INSTALL_MASK+=3D" /usr/share/${f}" + INSTALL_MASK+=3D" ${EPREFIX}/usr/share/${f}" fi done =20 --=20 Fabian Groffen Gentoo on a different level --PhI0NNT5cSwQ5Qx9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEELUvHd/Gtp7LaU1vuzpXahU5EQpMFAmLeyQYACgkQzpXahU5E QpMsCgf/WNj1LmwYSCphpzVnf1D7f3lGXd1XmuPxEi7UnN0R/tZaZtBBm+lhvGHv L4ZbobtMy5zuTU334amYisiSrfzKsuFP/XCVBEpcX8NzAH/857oZpLBDu01Htrt7 LhFRdp4X8jdw1PNlo3YbEXk0kNcMq+AS6g8ir7SPavZCGsUu1lVuMXrd3QSE1AkA lzDvdIgQL9aLP/hnGWFFnH1YQ6HcDnCQl7dH/rtAxW+D52B4HROped5WV8BIIwxO jYv9tPq73nBqUN7+kUYQNARu419l2qnXnxBGC6p5ESxPJHHHY6azMV7qU5SPfPSW 5lRcOWcr+amCs17yHM5DpcX89qhYrg== =k+3u -----END PGP SIGNATURE----- --PhI0NNT5cSwQ5Qx9--