[SCM] morituri/master: patch by: Christophe Fergeau <cfergeau at redhat.com) * morituri/common/program.py: When --release-id is used, we are not making guesses based on the CD lengths, so the message saying that we picked the closest match in duration, which can still trigger, is inappropriate.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93f033dfcac95dc8c9bd61b3b6e9d79eea44aae5
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Apr 1 20:40:21 2012 +0000

    	patch by: Christophe Fergeau <cfergeau at redhat.com)
    	* morituri/common/program.py:
    	  When --release-id is used, we are not making guesses based on the
    	  CD lengths, so the message saying that we picked the closest match
    	  in duration, which can still trigger, is inappropriate.

diff --git a/ChangeLog b/ChangeLog
index 93539bf..82b2dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Christophe Fergeau <cfergeau at redhat.com)
+
+	* morituri/common/program.py:
+	  When --release-id is used, we are not making guesses based on the
+	  CD lengths, so the message saying that we picked the closest match
+	  in duration, which can still trigger, is inappropriate.
+
 2012-01-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* TODO:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 0fa453f..f543b90 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -299,7 +299,7 @@ class Program(log.Loggable):
                             "are not the same" % (
                                 releaseTitle, i, metadata.releaseTitle))
 
-                if (len(deltas.keys()) > 1):
+                if (not release and len(deltas.keys()) > 1):
                     print
                     print 'Picked closest match in duration.'
                     print 'Others may be wrong in musicbrainz, please correct.'

-- 
morituri packaging