public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:prefix commit in: bin/
Date: Mon, 25 Jul 2022 16:49:14 +0000 (UTC)	[thread overview]
Message-ID: <1658767730.d17d765b1cc7615f053f970630a6ec3022f40dbb.grobian@gentoo> (raw)

commit:     d17d765b1cc7615f053f970630a6ec3022f40dbb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 16:48:50 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 16:48:50 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d17d765b

bin/misc-functions: drop unused/stale install_mask function

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

 bin/misc-functions.sh | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 8fcc23588..786c06c04 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -667,50 +667,6 @@ postinst_qa_check() {
 	done < <(printf "%s\0" "${qa_checks[@]}" | LC_ALL=C sort -u -z)
 }
 
-install_mask() {
-	local root="$1"
-	shift
-	local install_mask="$*"
-
-	# We think of $install_mask as a space-separated list of
-	# globs. We don't want globbing in the "for" loop; that is, we
-	# want to keep the asterisks in the indivual entries.
-	local shopts=$-
-	set -o noglob
-	local no_inst
-	for no_inst in ${install_mask}; do
-		# Here, $no_inst is a single "entry" potentially
-		# containing a glob. From now on, we *do* want to
-		# expand it.
-		set +o noglob
-
-		# The standard case where $no_inst is something that
-		# the shell could expand on its own.
-		if [[ -e "${root}"/${no_inst} || -L "${root}"/${no_inst} ||
-			"${root}"/${no_inst} != $(echo "${root}"/${no_inst}) ]] ; then
-			__quiet_mode || einfo "Removing ${no_inst}"
-			rm -Rf "${root}"/${no_inst} >&/dev/null
-		fi
-
-		# We also want to allow the user to specify a "bare
-		# glob." For example, $no_inst="*.a" should prevent
-		# ALL files ending in ".a" from being installed,
-		# regardless of their location/depth. We achieve this
-		# by passing the pattern to `find`.
-		find "${root}" \( -path "${no_inst}" -or -name "${no_inst}" \) \
-			-print0 2> /dev/null \
-		| LC_ALL=C sort -z \
-		| while read -r -d ''; do
-			__quiet_mode || einfo "Removing /${REPLY#${root}}"
-			rm -Rf "${REPLY}" >&/dev/null
-		done
-
-	done
-	# set everything back the way we found it
-	set +o noglob
-	set -${shopts}
-}
-
 preinst_mask() {
 	# Remove man pages, info pages, docs if requested. This is
 	# implemented in bash in order to respect INSTALL_MASK settings
@@ -719,7 +675,7 @@ preinst_mask() {
 	for f in man info doc; do
 		if has no${f} ${FEATURES}; then
 		    # PREFIX LOCAL: use EPREFIX with path
-			INSTALL_MASK="${INSTALL_MASK} ${EPREFIX}/usr/share/${f}"
+			INSTALL_MASK+=" ${EPREFIX}/usr/share/${f}"
 		fi
 	done
 


             reply	other threads:[~2022-07-25 16:49 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-25 16:49 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-07-03 20:19 [gentoo-commits] proj/portage:prefix commit in: bin/ Sam James
2022-08-16 17:04 Fabian Groffen
2022-07-28 18:33 Fabian Groffen
2022-07-28 18:23 Fabian Groffen
2022-07-25 16:55 Fabian Groffen
2021-07-06  7:10 Fabian Groffen
2021-01-04 10:42 Fabian Groffen
2020-12-07 16:49 Fabian Groffen
2020-11-28 19:47 Fabian Groffen
2020-11-28 19:37 Fabian Groffen
2019-07-01 13:11 Fabian Groffen
2019-06-03 19:21 Fabian Groffen
2019-06-03 19:00 Fabian Groffen
2018-12-23 19:55 Fabian Groffen
2018-12-06 12:46 Fabian Groffen
2017-03-24  7:43 Fabian Groffen
2017-03-23 15:25 Fabian Groffen
2014-10-24 19:14 Fabian Groffen
2014-10-02 18:47 Fabian Groffen
2014-09-30 16:04 Fabian Groffen
2013-10-06 19:01 Fabian Groffen
2013-09-18 18:34 Fabian Groffen
2013-09-18 18:34 Fabian Groffen
2013-09-12  7:32 Fabian Groffen
2013-08-16 12:50 Fabian Groffen
2013-03-31 10:03 Fabian Groffen
2013-03-24  8:45 Fabian Groffen
2013-03-24  8:34 Fabian Groffen
2013-01-10 21:13 Fabian Groffen
2012-12-26 15:06 Fabian Groffen
2012-12-02 12:58 Fabian Groffen
2012-10-22 17:57 Fabian Groffen
2012-09-30 12:12 Fabian Groffen
2012-09-12 18:26 Fabian Groffen
2012-08-12  7:44 Fabian Groffen
2012-07-08 17:25 Fabian Groffen
2012-04-03 18:09 Fabian Groffen
2011-12-10 13:14 Fabian Groffen
2011-12-09 20:36 Fabian Groffen
2011-12-03 16:49 Fabian Groffen
2011-12-03 15:22 Fabian Groffen
2011-09-23 18:33 Fabian Groffen
2011-09-23 18:23 Fabian Groffen
2011-09-13 18:45 Fabian Groffen
2011-08-20 18:35 Fabian Groffen
2011-04-24 17:20 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658767730.d17d765b1cc7615f053f970630a6ec3022f40dbb.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox