aesthetics updates #25218

1 files changed, 24 insertions, 23 deletions

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 52fa7536d6f8..6c8b2b57f5c9 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.45 2003/07/20 05:23:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.46 2003/08/07 02:58:18 vapier Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -162,21 +162,19 @@ cvs_fetch() {
 		cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
 		oldserver="`$run cat CVS/Root`"
 		if [ "$server" != "$oldserver" ]; then
-
 			einfo "Changing CVS server from $oldserver to $server:"
 			debug-print "$FUNCNAME: Changing CVS server from $oldserver to $server:"
 
-			einfo "Searching for CVS dirs..."
+			einfo "Searching for CVS dirs ..."
 			cvsdirs="`$run find . -iname CVS -print`"
 			debug-print "$FUNCNAME: CVS dirs found:"
 			debug-print "$cvsdirs"
 
-			einfo "Modifying CVS dirs..."
+			einfo "Modifying CVS dirs ..."
 			for x in $cvsdirs; do
 				debug-print "In $x"
 				$run echo "$server" > "$x/Root"
 			done
-
 		fi
 	fi
 
@@ -194,20 +192,26 @@ cvs_fetch() {
 	cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
 
 	# commands to run
-	cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
-	cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
-	cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
+	cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\""
+	cmdlogin_opts="login"
+	cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\""
+	cmdupdate_opts="update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
+	cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\""
+	cmdcheckout_opts="checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
 
 	cd "${ECVS_TOP_DIR}"
 	if [ "${ECVS_AUTH}" == "pserver" ]; then
-		einfo "Running $cmdlogin"
-		eval $cmdlogin || die "cvs login command failed"
+		debug-print "$FUNCNAME: logging into cvs ${cmdlogin} ${cmdlogin_opts}"
+		einfo "Logging in: ${cmdlogin}"
+		eval ${cmdlogin} ${cmdlogin_opts} >/dev/null || die "cvs login command failed"
 		if [ "${mode}" == "update" ]; then
-			einfo "Running $cmdupdate"
-			eval $cmdupdate || die "cvs update command failed"
+			debug-print "$FUNCNAME: updating cvs tree ${cmdupdate} ${cmdupdate_opts}"
+			einfo "Updating existing source tree: ${cmdupdate_opts}"
+			eval ${cmdupdate} ${cmdupdate_opts} || die "cvs update command failed"
 		elif [ "${mode}" == "checkout" ]; then
-			einfo "Running $cmdcheckout" 
-			eval $cmdcheckout|| die "cvs checkout command failed"
+			debug-print "$FUNCNAME: checking out from cvs tree ${cmdcheckout} ${cmdcheckout_opts}"
+			einfo "Checking out source tree (${cmdcheckout_opts})"
+			eval ${cmdcheckout} ${cmdcheckout_opts} || die "cvs checkout command failed"
 		fi
 #	elif [ "${ECVS_AUTH}" == "ext" ]; then
 #		# for ext there's also a possible ssh prompt, code not yet written
@@ -224,12 +228,10 @@ cvs_fetch() {
 	if [ -n "$ECVS_RUNAS" ]; then
 		chown `whoami` "${T}/cvspass"
 	fi
-
 }
 
 
 cvs_src_unpack() {
-
 	debug-print-function $FUNCNAME $*
 
 	debug-print "$FUNCNAME: init:
@@ -253,11 +255,10 @@ ECVS_LOCALNAME=$ECVS_LOCALNAME"
 	# of course, we could instead always reference it with the bash syntax for 'take default
 	# value from this other variable if undefined', but i'm lazy.
 	if [ -z "$ECVS_LOCALNAME" ]; then
-	    ECVS_LOCALNAME="$ECVS_MODULE"
-	    ECVS_LOCALNAME_SETDEFAULT=true
+		ECVS_LOCALNAME="$ECVS_MODULE"
+		ECVS_LOCALNAME_SETDEFAULT=true
 	fi
 
-
 	if [ "$ECVS_SERVER" == "offline" ]; then
 		# we're not required to fetch anything, the module already exists and shouldn't be updated
 	 	if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
@@ -267,14 +268,14 @@ ECVS_LOCALNAME=$ECVS_LOCALNAME"
 			die "ERROR: Offline mode specified, but dir ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
 		fi
 	elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
-		einfo "Fetching cvs module $ECVS_MODULE into $ECVS_TOP_DIR..."
+		einfo "Fetching module '$ECVS_MODULE' and saving in $ECVS_TOP_DIR ..."
 		cvs_fetch
 	else	# ECVS_SERVER not set
 		die "ERROR: CVS server not set, cannot continue."
 	fi
 
-	einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..."
-	debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
+	einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
+	debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
 
 	# probably redundant, but best to make sure
 	mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
@@ -312,7 +313,7 @@ ECVS_LOCALNAME=$ECVS_LOCALNAME"
 	    unset ECVS_LOCALNAME_SETDEFAULT
 	fi
 
-	einfo "Source now in ${WORKDIR}"
+	einfo "Module $ECVS_MODULE is now in ${WORKDIR}"
 }
 
 EXPORT_FUNCTIONS src_unpack