| 1 |
commit: 7a000b8718b20cb80c0563aac92202cd87a6b72c |
| 2 |
Author: Reinis Danne <rei4dan <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jan 20 16:21:48 2014 +0000 |
| 4 |
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jan 21 19:42:28 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a000b87 |
| 7 |
|
| 8 |
alternatives-2.eclass: Remove commented-out code |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/alternatives-2.eclass | 5 ----- |
| 12 |
1 file changed, 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass |
| 15 |
index 053d82c..dd16f6a 100644 |
| 16 |
--- a/eclass/alternatives-2.eclass |
| 17 |
+++ b/eclass/alternatives-2.eclass |
| 18 |
@@ -22,7 +22,6 @@ EXPORT_FUNCTIONS pkg_postinst pkg_prerm |
| 19 |
|
| 20 |
# alternatives_for alternative provider importance source target [ source target [...]] |
| 21 |
alternatives_for() { |
| 22 |
- #echo alternatives_for "${@}" |
| 23 |
|
| 24 |
(( $# >= 5 )) && (( ($#-3)%2 == 0)) || die "${FUNCNAME} requires exactly 3+N*2 arguments where N>=1" |
| 25 |
local alternative=${1} provider=${2} importance=${3} index src target ret=0 |
| 26 |
@@ -115,7 +114,6 @@ alternatives-2_pkg_postinst() { |
| 27 |
if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \ |
| 28 |
|| "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ |
| 29 |
-ne "${module_version}" ]]; then |
| 30 |
- #einfo "Creating alternatives module for ${alt}" |
| 31 |
if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then |
| 32 |
install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir" |
| 33 |
fi |
| 34 |
@@ -132,7 +130,6 @@ alternatives-2_pkg_postinst() { |
| 35 |
EOF |
| 36 |
fi |
| 37 |
|
| 38 |
- #echo eselect "${alt}" update "${provider}" |
| 39 |
einfo "Creating ${provider} alternative module for ${alt}" |
| 40 |
eselect "${alt}" update "${provider}" |
| 41 |
|
| 42 |
@@ -146,8 +143,6 @@ alternatives-2_pkg_prerm() { |
| 43 |
for a in "${ALTERNATIVES_PROVIDED[@]}"; do |
| 44 |
alt="${a%:*}" |
| 45 |
provider="${a#*:}" |
| 46 |
- #echo "Making sure ${alt} has a valid provider" |
| 47 |
- #echo eselect "${alt}" update${ignore} "${provider}" |
| 48 |
eselect "${alt}" update${ignore} "${provider}" && continue |
| 49 |
einfo "Removing ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)" |
| 50 |
case $? in |
Archives