| 1 |
commit: bc456db36c8ec44a4802b44d061477efbecd05e1 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Wed Feb 5 15:50:08 2014 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org> |
| 5 |
CommitDate: Wed Feb 5 15:50:08 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bc456db3 |
| 7 |
|
| 8 |
Rename a private function. |
| 9 |
|
| 10 |
--- |
| 11 |
bin/emerge-webrsync | 6 +++--- |
| 12 |
bin/isolated-functions.sh | 4 ++-- |
| 13 |
bin/save-ebuild-env.sh | 4 ++-- |
| 14 |
misc/emerge-delta-webrsync | 4 ++-- |
| 15 |
4 files changed, 9 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
| 18 |
index 85730a2..2f0689c 100755 |
| 19 |
--- a/bin/emerge-webrsync |
| 20 |
+++ b/bin/emerge-webrsync |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
#!/bin/bash |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# Author: Karl Trygve Kalleberg <karltk@g.o> |
| 27 |
# Rewritten from the old, Perl-based emerge-webrsync script |
| 28 |
@@ -50,12 +50,12 @@ export http_proxy ftp_proxy |
| 29 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
| 30 |
|
| 31 |
repo_name=gentoo |
| 32 |
-repo_location=$(__repo_key "${repo_name}" location) |
| 33 |
+repo_location=$(__repo_attr "${repo_name}" location) |
| 34 |
if [[ -z ${repo_location} ]]; then |
| 35 |
eecho "Repository '${repo_name}' not found" |
| 36 |
exit 1 |
| 37 |
fi |
| 38 |
-repo_sync_type=$(__repo_key "${repo_name}" sync-type) |
| 39 |
+repo_sync_type=$(__repo_attr "${repo_name}" sync-type) |
| 40 |
|
| 41 |
# If PORTAGE_NICENESS is overriden via the env then it will |
| 42 |
# still pass through the portageq call and override properly. |
| 43 |
|
| 44 |
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh |
| 45 |
index b99aec7..a22af57 100644 |
| 46 |
--- a/bin/isolated-functions.sh |
| 47 |
+++ b/bin/isolated-functions.sh |
| 48 |
@@ -1,5 +1,5 @@ |
| 49 |
#!/bin/bash |
| 50 |
-# Copyright 1999-2013 Gentoo Foundation |
| 51 |
+# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/eapi.sh" |
| 55 |
@@ -462,7 +462,7 @@ has() { |
| 56 |
return 1 |
| 57 |
} |
| 58 |
|
| 59 |
-__repo_key() { |
| 60 |
+__repo_attr() { |
| 61 |
local appropriate_section=0 exit_status=1 line saved_extglob_shopt=$(shopt -p extglob) |
| 62 |
shopt -s extglob |
| 63 |
while read line; do |
| 64 |
|
| 65 |
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh |
| 66 |
index 7a31b89..98cff83 100644 |
| 67 |
--- a/bin/save-ebuild-env.sh |
| 68 |
+++ b/bin/save-ebuild-env.sh |
| 69 |
@@ -1,5 +1,5 @@ |
| 70 |
#!/bin/bash |
| 71 |
-# Copyright 1999-2013 Gentoo Foundation |
| 72 |
+# Copyright 1999-2014 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
# @FUNCTION: __save_ebuild_env |
| 76 |
@@ -71,7 +71,7 @@ __save_ebuild_env() { |
| 77 |
__hasg __hasgq \ |
| 78 |
__save_ebuild_env __set_colors __filter_readonly_variables \ |
| 79 |
__preprocess_ebuild_env \ |
| 80 |
- __repo_key __source_all_bashrcs \ |
| 81 |
+ __repo_attr __source_all_bashrcs \ |
| 82 |
__ebuild_main __ebuild_phase __ebuild_phase_with_hooks \ |
| 83 |
__ebuild_arg_to_phase __ebuild_phase_funcs default \ |
| 84 |
__unpack_tar __unset_colors \ |
| 85 |
|
| 86 |
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync |
| 87 |
index b16982b..96564af 100755 |
| 88 |
--- a/misc/emerge-delta-webrsync |
| 89 |
+++ b/misc/emerge-delta-webrsync |
| 90 |
@@ -1,5 +1,5 @@ |
| 91 |
#!/bin/bash |
| 92 |
-# Copyright 1999-2013 Gentoo Foundation |
| 93 |
+# Copyright 1999-2014 Gentoo Foundation |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
# Author: Brian Harring <ferringb@g.o>, karltk@g.o originally. |
| 96 |
# Rewritten from the old, Perl-based emerge-webrsync script |
| 97 |
@@ -47,7 +47,7 @@ export http_proxy ftp_proxy |
| 98 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit |
| 99 |
|
| 100 |
repo_name=gentoo |
| 101 |
-repo_location=$(__repo_key "${repo_name}" location) |
| 102 |
+repo_location=$(__repo_attr "${repo_name}" location) |
| 103 |
if [[ -z ${repo_location} ]]; then |
| 104 |
eecho "Repository '${repo_name}' not found" |
| 105 |
exit 1 |
Archives