Don't submit to CDDB server when using musicbrainz

Closes: #669140

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

diff --git a/abcde b/abcde
index 202ad94..95c91e4 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -2768,7 +2768,7 @@ do_cddbedit ()
        echo "variousartists=$VARIOUSARTISTS" >> "$ABCDETEMPDIR/status"
        echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
 
-       if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
+       if [ "$EDITCDDB" = "y" ] && [ "$CDDBMETHOD" = "cddb" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
                if [ "$CDDBDATAMD5SUM" != "" ]  && [ "$CDDBDATAMD5SUM" != "$($MD5SUM "$CDDBDATA" | cut -d " " -f 1)" ]; then
                        # This works but does not have the necessary error checking
                        # yet. If you are familiar with the CDDB spec

diff --git a/changelog b/changelog
index 5163d50..4b68017 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ abcde 2.5.1 UNRELEASED
   * Several patches for improved Musicbrainz support from Martin Michlmayr:
     + add musicbrainz support for FLAC files with embedded cue files.
       Closes: #669139
+    + Don't submit to CDDB server when using musicbrainz
+      Closes: #669140
 
  -- Steve McIntyre <93sam@debian.org>  Fri, 13 Apr 2012 22:29:45 +0100