From: EinvalSledge@gmail.com <EinvalSledge@gmail.com@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Wed, 18 Apr 2012 14:01:15 +0000 (+0000)
Subject: Don't tag CDDB string with musicbrainz id
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/0aeff935eae8f5f34f07afa7b0a20f87ce2c98e0?hp=a1c07a84d5067aa63ddabb5cb707a925970395e0

Don't tag CDDB string with musicbrainz id
Closes: #699141


git-svn-id: http://abcde.googlecode.com/svn/trunk@304 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---

diff --git a/abcde b/abcde
index 95c91e4..cdc50d4 100755
--- a/abcde
+++ b/abcde
@@ -796,7 +796,9 @@ do_tag ()
 	if [ -z "$COMMENTOUTPUT" ]; then
 		COMMENTOUTPUT="$(getcddbinfo TRACK-INFO)"
 	fi
-	CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+	if [ "$CDDBMETHOD" = "cddb" ]; then
+		CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+	fi
 	run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
 	# If we want to start the tracks with a given number, we need to modify the
 	# TRACKNUM value before evaluation
diff --git a/changelog b/changelog
index 4b68017..090a53f 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ abcde 2.5.1 UNRELEASED
       Closes: #669139
     + Don't submit to CDDB server when using musicbrainz
       Closes: #669140
+    + Don't tag CDDB string with musicbrainz id
+      Closes: #699141
 
  -- Steve McIntyre <93sam@debian.org>  Fri, 13 Apr 2012 22:29:45 +0100