[SCM] morituri/master: * morituri/common/program.py: Don't fail if there is no metadata.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7cff47a8d4317154b244e7cb387026c66deb3183
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Aug 14 14:48:02 2011 +0000

    	* morituri/common/program.py:
    	  Don't fail if there is no metadata.

diff --git a/ChangeLog b/ChangeLog
index 48a3bfb..a0cb288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2011-08-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/program.py:
+	  Don't fail if there is no metadata.
+
+2011-08-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/program.py:
 	* morituri/rip/debug.py:
 	  Pychecker fixes.
 
diff --git a/morituri/common/program.py b/morituri/common/program.py
index e585457..273cbf7 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -355,6 +355,8 @@ class Program(log.Loggable):
         ret = None
 
         metadatas = None
+        e = None
+
         for _ in range(0, 4):
             try:
                 metadatas = musicbrainz(mbdiscid)
@@ -364,7 +366,8 @@ class Program(log.Loggable):
                 continue
 
         if not metadatas:
-            print "Error:", e
+            if e:
+                print "Error:", e
             print 'Continuing without metadata'
 
         if metadatas:

-- 
morituri packaging