From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-science+bounces-1892-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 41A75138247
for <garchives@archives.gentoo.org>; Mon, 20 Jan 2014 17:54:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B4C04E1044;
Mon, 20 Jan 2014 17:53:25 +0000 (UTC)
Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41])
(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1C618E1031
for <gentoo-science@lists.gentoo.org>; Mon, 20 Jan 2014 17:53:24 +0000 (UTC)
Received: by mail-ee0-f41.google.com with SMTP id e49so3638323eek.0
for <gentoo-science@lists.gentoo.org>; Mon, 20 Jan 2014 09:53:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=from:to:subject:date:message-id:in-reply-to:references;
bh=dolxWQ5lJXwCrlmQY8YA5kxZO4Np9dE+swPR0jJQy0c=;
b=J/Mkh3F1FycVZS3l74bUV9vx0CFc3BTq6QneQkwKi/BWVlJJYISdN2hX7XzvD3k3v9
vQ3zqAunvHMXaIChdPrP9Wtc8yR+Us4lOnSgA1AyNxie96iZIwFFZiBPr76tbxOYnn6U
UhCNkPF/PvoGJas+BVMUrQjUtj02c2k1YDEJcz/4aM/kb0EkSaHygeaHHuN9c1pkFVkS
T+nJUXErjokuOzCxitYXGQdr57IElTrpbH2q80RQj+5uwAfc8n5CkXgTmLfpg22rUSbo
avNNIlyBtqj/2IXVZVfLCUWgbsJ4HewGUCG7k3sDoFPXysCRej98vHzeZpZJH/9jbx27
AiUA==
X-Received: by 10.14.107.3 with SMTP id n3mr5972468eeg.67.1390240403894;
Mon, 20 Jan 2014 09:53:23 -0800 (PST)
Received: from localhost.localdomain (dsl-trebrasgw2-58c0d8-67.dhcp.inet.fi. [88.192.216.67])
by mx.google.com with ESMTPSA id o47sm5514777eem.21.2014.01.20.09.53.22
for <gentoo-science@lists.gentoo.org>
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 20 Jan 2014 09:53:23 -0800 (PST)
From: Reinis Danne <rei4dan@gmail.com>
To: gentoo-science@lists.gentoo.org
Subject: [gentoo-science] [PATCH 04/10] alternatives-2.eclass: Remove commented-out code
Date: Mon, 20 Jan 2014 19:53:06 +0200
Message-Id: <1390240392-12173-5-git-send-email-rei4dan@gmail.com>
X-Mailer: git-send-email 1.8.5.3
In-Reply-To: <1390240392-12173-1-git-send-email-rei4dan@gmail.com>
References: <1390240392-12173-1-git-send-email-rei4dan@gmail.com>
Precedence: bulk
List-Post: <mailto:gentoo-science@lists.gentoo.org>
List-Help: <mailto:gentoo-science+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-science+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-science+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-science.gentoo.org>
X-BeenThere: gentoo-science@lists.gentoo.org
Reply-to: gentoo-science@lists.gentoo.org
X-Archives-Salt: a853ea35-d8f5-466c-ac3a-db80b8b99885
X-Archives-Hash: 0bf6a55e97fc59475d78d5c77af31a64
---
eclass/alternatives-2.eclass | 5 -----
1 file changed, 5 deletions(-)
diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
index a431d26..98317dd 100644
--- a/eclass/alternatives-2.eclass
+++ b/eclass/alternatives-2.eclass
@@ -22,7 +22,6 @@ EXPORT_FUNCTIONS pkg_postinst pkg_prerm
# alternatives_for alternative provider importance source target [ source target [...]]
alternatives_for() {
- #echo alternatives_for "${@}"
(( $# >= 5 )) && (( ($#-3)%2 == 0)) || die "${FUNCNAME} requires exactly 3+N*2 arguments where N>=1"
local alternative=${1} provider=${2} importance=${3} index src target ret=0
@@ -115,7 +114,6 @@ alternatives-2_pkg_postinst() {
if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \
|| "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \
-ne "${module_version}" ]]; then
- #einfo "Creating alternatives module for ${alt}"
if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then
install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir"
fi
@@ -132,7 +130,6 @@ alternatives-2_pkg_postinst() {
EOF
fi
- #echo eselect "${alt}" update "${provider}"
einfo "Creating ${provider} alternative module for ${alt}"
eselect "${alt}" update "${provider}"
@@ -146,8 +143,6 @@ alternatives-2_pkg_prerm() {
for a in "${ALTERNATIVES_PROVIDED[@]}"; do
alt="${a%:*}"
provider="${a#*:}"
- #echo "Making sure ${alt} has a valid provider"
- #echo eselect "${alt}" update${ignore} "${provider}"
eselect "${alt}" update${ignore} "${provider}" && continue
einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
if [[ $? -eq 2 ]]; then
--
1.8.5.3