diff options
| author | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:52 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:52 +0200 |
| commit | c8af7eb1285a2683460618b71e2e9a14ca6badcd (patch) | |
| tree | 09f23f2e4455b902bbc3f505b56b7e0433e90d91 /eclass | |
| parent | ec9bd064a3b2e495970f49d751d57ca62fa77b84 (diff) | |
| download | gentoo-c8af7eb1285a2683460618b71e2e9a14ca6badcd.tar.gz gentoo-c8af7eb1285a2683460618b71e2e9a14ca6badcd.tar.bz2 gentoo-c8af7eb1285a2683460618b71e2e9a14ca6badcd.zip | |
eclass: canonicalize debug-print-function calls
Closes: https://github.com/gentoo/gentoo/pull/37652
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
58 files changed, 402 insertions, 402 deletions
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass index 00908dbd8982..ac6dc960ca24 100644 --- a/eclass/acct-group.eclass +++ b/eclass/acct-group.eclass @@ -89,7 +89,7 @@ S=${WORKDIR} # Performs sanity checks for correct eclass usage, and early-checks # whether requested GID can be enforced. acct-group_pkg_pretend() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" # verify ACCT_GROUP_ID [[ -n ${ACCT_GROUP_ID} ]] || die "Ebuild error: ACCT_GROUP_ID must be set!" @@ -131,7 +131,7 @@ acct-group_pkg_pretend() { # @DESCRIPTION: # Installs sysusers.d file for the group. acct-group_src_install() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" # check for the override, use PN in case this is an overlay and # ACCT_GROUP_NAME is not PN and not valid in a bash variable name @@ -156,7 +156,7 @@ acct-group_src_install() { # @DESCRIPTION: # Creates the group if it does not exist yet. acct-group_pkg_preinst() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ ${EUID} -ne 0 || -n ${EPREFIX} ]]; then einfo "Insufficient privileges to execute ${FUNCNAME[0]}" diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index 19c5239eaede..b3bcff7e550c 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -155,7 +155,7 @@ S=${WORKDIR} # Generate appropriate RDEPEND from ACCT_USER_GROUPS. This must be # called if ACCT_USER_GROUPS are set. acct-user_add_deps() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" # ACCT_USER_GROUPS sanity check if [[ $(declare -p ACCT_USER_GROUPS) != "declare -a"* ]]; then @@ -218,7 +218,7 @@ eislocked() { # Performs sanity checks for correct eclass usage, and early-checks # whether requested UID can be enforced. acct-user_pkg_pretend() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" # verify that acct-user_add_deps() has been called # (it verifies ACCT_USER_GROUPS itself) @@ -267,7 +267,7 @@ acct-user_pkg_pretend() { # Installs a keep-file into the user's home directory to ensure it is # owned by the package, and sysusers.d file. acct-user_src_install() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" # Replace reserved characters in comment : "${ACCT_USER_COMMENT:=${DESCRIPTION//[:,=]/;}}" @@ -328,7 +328,7 @@ acct-user_src_install() { # Creates the user if it does not exist yet. Sets permissions # of the home directory in install image. acct-user_pkg_preinst() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" unset _ACCT_USER_ADDED @@ -397,7 +397,7 @@ acct-user_pkg_preinst() { # Updates user properties if necessary. This needs to be done after # new home directory is installed. acct-user_pkg_postinst() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ -n ${_ACCT_USER_ADDED} ]]; then # We just added the user; no need to update it @@ -481,7 +481,7 @@ acct-user_pkg_postinst() { # @DESCRIPTION: # Ensures that the user account is locked out when it is removed. acct-user_pkg_prerm() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ -n ${REPLACED_BY_VERSION} ]]; then return diff --git a/eclass/ada.eclass b/eclass/ada.eclass index faff19a6ac85..9206bfcc42ca 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -110,7 +110,7 @@ readonly _ADA_ALL_IMPLS # unsupported, returns 1 -- and the caller should ignore the entry. # If it is invalid, dies with an appropriate error message. _ada_impl_supported() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 1 ]] || die "${FUNCNAME}: takes exactly 1 argument (impl)." @@ -208,7 +208,7 @@ _ada_set_impls() { # They are described more completely in the eclass # variable documentation. ada_export() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local impl var @@ -404,7 +404,7 @@ unset -f _ada_single_set_globals # setup will be done. If wrapper update is requested, the directory # shall be removed first. ada_wrapper_setup() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local workdir=${1:-${T}/${EADA}} local impl=${2:-${EADA}} @@ -470,7 +470,7 @@ ada_wrapper_setup() { # Determine what the selected Ada implementation is and set # the Ada build environment up for it. ada_setup() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" unset EADA @@ -518,7 +518,7 @@ ada_setup() { # @DESCRIPTION: # Runs ada_setup. ada_pkg_setup() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${MERGE_TYPE} != binary ]] && ada_setup } diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass index f7776f463546..880205a30539 100644 --- a/eclass/apache-module.eclass +++ b/eclass/apache-module.eclass @@ -105,7 +105,7 @@ inherit depend.apache # Internal function to construct the default ${APXS2_S} path if required. apache_cd_dir() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local CD_DIR="${APXS2_S}" @@ -123,7 +123,7 @@ apache_cd_dir() { # Internal function to construct the default ${APACHE2_MOD_FILE} if required. apache_mod_file() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local MOD_FILE="${APACHE2_MOD_FILE:-$(apache_cd_dir)/.libs/${PN}.so}" @@ -135,7 +135,7 @@ apache_mod_file() { # optional first argument `html'; if the first argument is equals `html', only # html files are returned, otherwise normal (non-html) docs are returned. apache_doc_magic() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local DOCS= @@ -161,7 +161,7 @@ apache_doc_magic() { # module requires a different build setup than this, use ${APXS} in your own # src_compile routine. apache-module_src_compile() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local CD_DIR=$(apache_cd_dir) cd "${CD_DIR}" || die "cd ${CD_DIR} failed" @@ -180,7 +180,7 @@ apache-module_src_compile() { # 55_mod_foo.conf, APACHE2_MOD_CONF would be 55_mod_foo. ${DOCFILES} contains # the list of files you want filed as documentation. apache-module_src_install() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local CD_DIR=$(apache_cd_dir) pushd "${CD_DIR}" >/dev/null || die "cd ${CD_DIR} failed" @@ -222,7 +222,7 @@ apache-module_src_install() { # @DESCRIPTION: # This prints out information about the installed module and how to enable it. apache-module_pkg_postinst() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" if [[ -n "${APACHE2_MOD_DEFINE}" ]] ; then local my_opts="-D ${APACHE2_MOD_DEFINE// / -D }" diff --git a/eclass/app-alternatives.eclass b/eclass/app-alternatives.eclass index f670b7d843f9..32afedba1e68 100644 --- a/eclass/app-alternatives.eclass +++ b/eclass/app-alternatives.eclass @@ -36,7 +36,7 @@ _APP_ALTERNATIVES_ECLASS=1 # @DESCRIPTION: # Set ebuild metadata variables. _app-alternatives_set_globals() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ ${ALTERNATIVES@a} != *a* ]]; then die 'ALTERNATIVES must be an array.' @@ -71,7 +71,7 @@ _app-alternatives_set_globals # @DESCRIPTION: # Get the flag name for the selected alternative (i.e. the USE flag set). get_alternative() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local flag for flag in "${ALTERNATIVES[@]%%:*}"; do diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass index 643c458dd8a0..2220cb2be508 100644 --- a/eclass/bash-completion-r1.eclass +++ b/eclass/bash-completion-r1.eclass @@ -41,7 +41,7 @@ esac # @EXAMPLE: # _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion _bash-completion-r1_get_bashdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then local path @@ -59,7 +59,7 @@ _bash-completion-r1_get_bashdir() { # @DESCRIPTION: # Get unprefixed bash-completion completions directory. _bash-completion-r1_get_bashcompdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions } @@ -69,7 +69,7 @@ _bash-completion-r1_get_bashcompdir() { # @DESCRIPTION: # Get unprefixed bash-completion helpers directory. _bash-completion-r1_get_bashhelpersdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _bash-completion-r1_get_bashdir helpersdir /usr/share/bash-completion/helpers } @@ -78,7 +78,7 @@ _bash-completion-r1_get_bashhelpersdir() { # @DESCRIPTION: # Get the bash-completion completions directory. get_bashcompdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" echo "${EPREFIX}$(_bash-completion-r1_get_bashcompdir)" } @@ -88,7 +88,7 @@ get_bashcompdir() { # @DESCRIPTION: # Get the bash-completion helpers directory. get_bashhelpersdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" echo "${EPREFIX}$(_bash-completion-r1_get_bashhelpersdir)" } @@ -99,7 +99,7 @@ get_bashhelpersdir() { # Install bash-completion files passed as args. Has EAPI-dependent failure # behavior (like doins). dobashcomp() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" ( insopts -m 0644 @@ -114,7 +114,7 @@ dobashcomp() { # Install bash-completion file under a new name. Has EAPI-dependent failure # behavior (like newins). newbashcomp() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" ( insopts -m 0644 @@ -128,7 +128,7 @@ newbashcomp() { # @DESCRIPTION: # Alias <basename> completion to one or more commands (<alias>es). bashcomp_alias() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -lt 2 ]] && die "Usage: ${FUNCNAME} <basename> <alias>..." local base=${1} f diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 7492a78209e7..e1818be28af3 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -123,7 +123,7 @@ APACHE2_4_DEPEND="=www-servers/apache-2.4*" # ============================================================================== _init_apache2() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" # WARNING: Do not use these variables with anything that is put # into the dependency cache (DEPEND/RDEPEND/etc) @@ -143,7 +143,7 @@ _init_apache2_late() { } _init_no_apache() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" APACHE_VERSION="0" } @@ -158,7 +158,7 @@ _init_no_apache() { # apache-2.x support. If the myiuse parameter is not given it defaults to # apache2. depend.apache_pkg_setup() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" if [[ "${EBUILD_PHASE}" != "setup" ]]; then die "$FUNCNAME() should be called in pkg_setup()" @@ -184,7 +184,7 @@ depend.apache_pkg_setup() { # An ebuild should additionally call depend.apache_pkg_setup() in pkg_setup() # with the same myiuse parameter. want_apache() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" want_apache2 "$@" } @@ -196,7 +196,7 @@ want_apache() { # An ebuild should additionally call depend.apache_pkg_setup() in pkg_setup() # with the same myiuse parameter. want_apache2() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local myiuse=${1:-apache2} IUSE="${IUSE} ${myiuse}" @@ -213,7 +213,7 @@ want_apache2() { # An ebuild should additionally call depend.apache_pkg_setup() in pkg_setup() # with the same myiuse parameter. want_apache2_2() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" case ${EAPI} in 7) @@ -237,7 +237,7 @@ want_apache2_2() { # An ebuild should additionally call depend.apache_pkg_setup() in pkg_setup() # with the same myiuse parameter. want_apache2_4() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" local myiuse=${1:-apache2} IUSE="${IUSE} ${myiuse}" @@ -249,7 +249,7 @@ want_apache2_4() { # @DESCRIPTION: # An ebuild calls this to get the dependency information for apache. need_apache() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" need_apache2 } @@ -257,7 +257,7 @@ need_apache() { # @DESCRIPTION: # An ebuild calls this to get the dependency information for apache-2.x. need_apache2() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" DEPEND="${DEPEND} ${APACHE2_DEPEND}" RDEPEND="${RDEPEND} ${APACHE2_DEPEND}" @@ -268,7 +268,7 @@ need_apache2() { # @DESCRIPTION: # An ebuild calls this to get the dependency information for apache-2.2.x. need_apache2_2() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" case ${EAPI} in 7) @@ -286,7 +286,7 @@ need_apache2_2() { # @DESCRIPTION: # An ebuild calls this to get the dependency information for apache-2.4.x. need_apache2_4() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" DEPEND="${DEPEND} ${APACHE2_4_DEPEND}" RDEPEND="${RDEPEND} ${APACHE2_4_DEPEND}" @@ -299,7 +299,7 @@ need_apache2_4() { # dependency without USE-flag, in which case want_apache does not work. # DO NOT call this function in global scope. has_apache() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" if has_version '>=www-servers/apache-2'; then _init_apache2 @@ -315,7 +315,7 @@ has_apache() { # built with a threaded MPM. If the myflag parameter is not given it defaults to # threads. has_apache_threads() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" if ! has_version 'www-servers/apache[threads]'; then return @@ -338,7 +338,7 @@ has_apache_threads() { # package if apache has been built with a threaded MPM. If the myflag parameter # is not given it defaults to threads. has_apache_threads_in() { - debug-print-function $FUNCNAME $* + debug-print-function ${FUNCNAME} "$@" if ! has_version 'www-servers/apache[threads]'; then return diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index bb058d488a13..67ba459f0ebe 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -72,7 +72,7 @@ dist-kernel_get_image_path() { # the kernel version, <image> full path to the image, <system.map> # full path to System.map. dist-kernel_install_kernel() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 3 ]] || die "${FUNCNAME}: invalid arguments" local version=${1} @@ -125,7 +125,7 @@ dist-kernel_install_kernel() { # This function is to be used in pkg_postinst() of ebuilds installing # kernel modules that are included in the initramfs. dist-kernel_reinstall_initramfs() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 2 ]] || die "${FUNCNAME}: invalid arguments" local kernel_dir=${1} @@ -148,7 +148,7 @@ dist-kernel_reinstall_initramfs() { # @DESCRIPTION: # Convert a Gentoo-style ebuild version to kernel "x.y.z[-rcN]" version. dist-kernel_PV_to_KV() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -ne 1 ]] && die "${FUNCNAME}: invalid arguments" local pv=${1} @@ -165,7 +165,7 @@ dist-kernel_PV_to_KV() { # Returns the suffix for kernel modules based on the CONFIG_MODULES_COMPESS_* # setting in the kernel config and USE=modules-compress. dist-kernel_get_module_suffix() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 1 ]] || die "${FUNCNAME}: invalid arguments" @@ -194,7 +194,7 @@ dist-kernel_get_module_suffix() { # Traverse path for duplicate (un)compressed modules and remove all # but the newest variant. dist-kernel_compressed_module_cleanup() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -ne 1 ]] && die "${FUNCNAME}: invalid arguments" local path=${1} diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index d2549c97ff3b..c3a7d112b03f 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -493,7 +493,7 @@ unset -f _distutils_set_globals # python_compile_all(), you can call the original implementation # as sphinx_compile_all. distutils_enable_sphinx() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -ge 1 ]] || die "${FUNCNAME} takes at least one arg: <subdir>" _DISTUTILS_SPHINX_SUBDIR=${1} @@ -589,7 +589,7 @@ distutils_enable_sphinx() { # This function must be called in global scope, after RDEPEND has been # declared. Take care not to overwrite the variables set by it. distutils_enable_tests() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" case ${1} in --install) @@ -670,7 +670,7 @@ distutils_enable_tests() { # # This command dies on failure. esetup.py() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _python_check_EPYTHON @@ -729,7 +729,7 @@ distutils_install_for_testing() { # This function must only be used in python_test(). The created file # will automatically be removed upon leaving the test phase. distutils_write_namespace() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ ! ${DISTUTILS_USE_PEP517:-no} != no ]]; then die "${FUNCNAME} is available only in PEP517 mode" @@ -935,7 +935,7 @@ _distutils-r1_print_package_versions() { # At some point in the future, it may also apply eclass-specific # distutils patches and/or quirks. distutils-r1_python_prepare_all() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _python_sanity_checks _distutils-r1_check_all_phase_mismatch @@ -1057,7 +1057,7 @@ _distutils-r1_copy_egg_info() { # Print the DISTUTILS_USE_PEP517 value corresponding to the backend # passed as the only argument. _distutils-r1_backend_to_key() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local backend=${1} case ${backend} in @@ -1109,7 +1109,7 @@ _distutils-r1_backend_to_key() { # Read (or guess, in case of setuptools) the build-backend # for the package in the current directory. _distutils-r1_get_backend() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local build_backend legacy_fallback if [[ -f pyproject.toml ]]; then @@ -1179,7 +1179,7 @@ _distutils-r1_get_backend() { # # This function is intended for expert use only. distutils_wheel_install() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ ${#} -ne 2 ]]; then die "${FUNCNAME} takes exactly two arguments: <root> <wheel>" fi @@ -1236,7 +1236,7 @@ distutils_wheel_install() { # wrapping executables. The wheel path is returned # in DISTUTILS_WHEEL_PATH variable. distutils_pep517_install() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: root" if [[ ! ${DISTUTILS_USE_PEP517:-no} != no ]]; then @@ -1448,7 +1448,7 @@ declare -g -A DISTUTILS_WHEELS=() # function will be appended to setup.py invocation, i.e. passed # as options to the 'build' command. distutils-r1_python_compile() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _python_check_EPYTHON @@ -1514,7 +1514,7 @@ distutils-r1_python_compile() { # @DESCRIPTION: # Moves and wraps all installed scripts/executables as necessary. _distutils-r1_wrap_scripts() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -eq 1 ]] || die "usage: ${FUNCNAME} <bindir>" local b |
