From 70da1809aca6dce9afef70bd7c5e6cacce179e87 Mon Sep 17 00:00:00 2001
From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Sat, 5 Nov 2005 14:48:45 +0000
Subject: [PATCH] Rewritten warning information. Removed trailing / from
 DISCID. Set DISCID for a proper message.

git-svn-id: http://abcde.googlecode.com/svn/trunk@157 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---
 abcde | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/abcde b/abcde
index b4cd993..701a988 100755
--- a/abcde
+++ b/abcde
@@ -1353,6 +1353,7 @@ do_discid ()
 			disktool -m ${CDROM#/dev/}
 		fi
 		WEHAVEACD=y
+		DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
 	else
 		TRACKINFO=$(cat "$WAVOUTPUTDIR/abcde.$DISCID/discid")
 	fi
@@ -2552,7 +2553,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		b) BATCHNORM=y ;;
 		B) NOBATCHREPLAYGAIN=y ;;
 		c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;;
-		C) DISCID="${OPTARG#abcde.}" ;;
+		C) DISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;;
 		d) CDROM="$OPTARG" ;;
 		D) set -x ;;
 		e) ERASEENCODEDSTATUS=y ;;
@@ -3493,8 +3494,10 @@ if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
 	decho [ENCODED_FORMATS]
 	decho [MOVED_FORMATS]
 	if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
-		log warning "Not all encoded formats have been requested to be moved."
-		log warning "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data."
+		log warning "The encoded formats does not match with the moved ones"
+		log warning "Formats encoded: $( echo $ENCODED_FORMATS | tr "|" " " )"
+		log warning "Formats moved: $( echo $MOVED_FORMATS | tr "|" " " )"
+		log warning "Use \"abcde -a clean -f -C $DISCID\" to force the removal of the remaining data."
 		DOCLEAN=n
 	fi
 fi
-- 
2.20.1