From a1c07a84d5067aa63ddabb5cb707a925970395e0 Mon Sep 17 00:00:00 2001 From: "EinvalSledge@gmail.com" Date: Wed, 18 Apr 2012 13:54:34 +0000 Subject: [PATCH 1/1] 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 --- abcde | 2 +- changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/abcde b/abcde index 202ad94..95c91e4 100755 --- 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 --- 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 -- 2.20.1