[SCM] morituri/master: Ignore matches in other AccurateRip db responses

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f25b9afdea0780e27d97129d0b0dd2f6b1834ad3
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Nov 14 23:04:39 2010 +0100

    Ignore matches in other AccurateRip db responses

diff --git a/debian/patches/1003_ignore-other-matches.patch b/debian/patches/1003_ignore-other-matches.patch
new file mode 100644
index 0000000..9597623
--- /dev/null
+++ b/debian/patches/1003_ignore-other-matches.patch
@@ -0,0 +1,20 @@
+Description: Ignore matches in other AccurateRip database responses
+From: Loïc Minier <lool at dooz.org>
+Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/5
+Last-Update: 2010-10-14
+--- a/morituri/common/program.py
++++ b/morituri/common/program.py
+@@ -503,10 +503,9 @@
+                     if not response:
+                         response = r
+                     else:
+-                        assert r == response, \
+-                            "checksum %s for %d matches wrong response %d, "\
+-                            "checksum %s" % (
+-                                csum, i + 1, j + 1, response.checksums[i])
++                        if r != response:
++                            self.warning("Track: %02d: checksum %08x matches wrong response %d" % (i + 1, csum, j + 1))
++                            continue
+                     self.debug("Track: %02d matched in AccurateRip database",
+                         i + 1)
+                     trackResult.accurip = True
diff --git a/debian/patches/series b/debian/patches/series
index f22ed42..30b371e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001_fix_support_non-utf-8_console.patch
 1001_fix-non-ascii-htoa.patch
 1002_fix-htoa-m3u-filename.patch
+1003_ignore-other-matches.patch

-- 
morituri packaging