aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2014-02-05 16:50:08 +0100
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2014-02-05 16:50:08 +0100
commitbc456db36c8ec44a4802b44d061477efbecd05e1 (patch)
tree170b7b0ee1575fb460de3d2a4ca47961b4dfba58 /bin
parenttest_compile_modules: ignore unreadable files/dirs (diff)
downloadportage-bc456db36c8ec44a4802b44d061477efbecd05e1.tar.gz
portage-bc456db36c8ec44a4802b44d061477efbecd05e1.tar.bz2
portage-bc456db36c8ec44a4802b44d061477efbecd05e1.zip
Rename a private function.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge-webrsync6
-rw-r--r--bin/isolated-functions.sh4
-rw-r--r--bin/save-ebuild-env.sh4
3 files changed, 7 insertions, 7 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 85730a2cf..2f0689c15 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
# Rewritten from the old, Perl-based emerge-webrsync script
@@ -50,12 +50,12 @@ export http_proxy ftp_proxy
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
repo_name=gentoo
-repo_location=$(__repo_key "${repo_name}" location)
+repo_location=$(__repo_attr "${repo_name}" location)
if [[ -z ${repo_location} ]]; then
eecho "Repository '${repo_name}' not found"
exit 1
fi
-repo_sync_type=$(__repo_key "${repo_name}" sync-type)
+repo_sync_type=$(__repo_attr "${repo_name}" sync-type)
# If PORTAGE_NICENESS is overriden via the env then it will
# still pass through the portageq call and override properly.
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index b99aec729..a22af574a 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/eapi.sh"
@@ -462,7 +462,7 @@ has() {
return 1
}
-__repo_key() {
+__repo_attr() {
local appropriate_section=0 exit_status=1 line saved_extglob_shopt=$(shopt -p extglob)
shopt -s extglob
while read line; do
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 7a31b89d4..98cff839e 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @FUNCTION: __save_ebuild_env
@@ -71,7 +71,7 @@ __save_ebuild_env() {
__hasg __hasgq \
__save_ebuild_env __set_colors __filter_readonly_variables \
__preprocess_ebuild_env \
- __repo_key __source_all_bashrcs \
+ __repo_attr __source_all_bashrcs \
__ebuild_main __ebuild_phase __ebuild_phase_with_hooks \
__ebuild_arg_to_phase __ebuild_phase_funcs default \
__unpack_tar __unset_colors \