[SCM] morituri/master: * morituri/result/logger.py: Fix logging of AR data

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 12833ba67b422306729ebfd587671d35a21f8dc1
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Jun 24 12:56:59 2012 +0000

    	* morituri/result/logger.py:
    	  Fix logging of AR data

diff --git a/ChangeLog b/ChangeLog
index 4328cbc..7a0c8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/result/logger.py:
+	  Fix logging of AR data
+
+2012-06-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/program.py:
 	  Tell us which track is not in the db.
 
diff --git a/morituri/result/logger.py b/morituri/result/logger.py
index 16f2eda..c18cea1 100644
--- a/morituri/result/logger.py
+++ b/morituri/result/logger.py
@@ -117,15 +117,14 @@ class MorituriLogger(object):
             lines.append("  WARNING: no CRC check done")
         
         if trackResult.accurip:
-            if trackResult.ARCRC == trackResult.ARDBCRC:
-                lines.append('  Accurately ripped (confidence %d) [%08X]' % (
-                    trackResult.ARDBConfidence, trackResult.ARCRC))
-            else:
-                lines.append('  Cannot be verified as accurate  '
-                    '(confidence %d),  [%08X], AccurateRip returned [%08x]' % (
-                        trackResult.ARDBConfidence,
-                        trackResult.ARCRC, trackResult.ARDBCRC))
+            lines.append('  Accurately ripped (confidence %d) [%08X]' % (
+                trackResult.ARDBConfidence, trackResult.ARCRC))
         else:
-            lines.append('  Track not present in AccurateRip database')
+            if trackResult.ARDBCRC:
+                lines.append('  Cannot be verified as accurate '
+                    '[%08X], AccurateRip returned [%08X]' % (
+                        trackResult.ARCRC, trackResult.ARDBCRC))
+            else:
+                lines.append('  Track not present in AccurateRip database')
 
         return lines

-- 
morituri packaging