Gentoo Archives: gentoo-science

From: Reinis Danne <rei4dan@×××××.com>
To: gentoo-science@l.g.o
Subject: [gentoo-science] [PATCH 04/10] alternatives-2.eclass: Remove commented-out code
Date: Mon, 20 Jan 2014 17:54:07
Message-Id: 1390240392-12173-5-git-send-email-rei4dan@gmail.com
In Reply to: [gentoo-science] [PATCH 00/10] alternatives-2.eclass updates by Reinis Danne
1 ---
2 eclass/alternatives-2.eclass | 5 -----
3 1 file changed, 5 deletions(-)
4
5 diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
6 index a431d26..98317dd 100644
7 --- a/eclass/alternatives-2.eclass
8 +++ b/eclass/alternatives-2.eclass
9 @@ -22,7 +22,6 @@ EXPORT_FUNCTIONS pkg_postinst pkg_prerm
10
11 # alternatives_for alternative provider importance source target [ source target [...]]
12 alternatives_for() {
13 - #echo alternatives_for "${@}"
14
15 (( $# >= 5 )) && (( ($#-3)%2 == 0)) || die "${FUNCNAME} requires exactly 3+N*2 arguments where N>=1"
16 local alternative=${1} provider=${2} importance=${3} index src target ret=0
17 @@ -115,7 +114,6 @@ alternatives-2_pkg_postinst() {
18 if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \
19 || "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \
20 -ne "${module_version}" ]]; then
21 - #einfo "Creating alternatives module for ${alt}"
22 if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then
23 install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir"
24 fi
25 @@ -132,7 +130,6 @@ alternatives-2_pkg_postinst() {
26 EOF
27 fi
28
29 - #echo eselect "${alt}" update "${provider}"
30 einfo "Creating ${provider} alternative module for ${alt}"
31 eselect "${alt}" update "${provider}"
32
33 @@ -146,8 +143,6 @@ alternatives-2_pkg_prerm() {
34 for a in "${ALTERNATIVES_PROVIDED[@]}"; do
35 alt="${a%:*}"
36 provider="${a#*:}"
37 - #echo "Making sure ${alt} has a valid provider"
38 - #echo eselect "${alt}" update${ignore} "${provider}"
39 eselect "${alt}" update${ignore} "${provider}" && continue
40 einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
41 if [[ $? -eq 2 ]]; then
42 --
43 1.8.5.3