fix merge conflict

server/djrandom/metadata_fixer/metadata_fixer.py

@@ -56,6 +56,8 @@ class MetadataFixer(object):
                 if e.code >= 400 and e.code < 500:
                     raise NoMetadataError('HTTP Error %d' % e.code)
 
+            log.debug('retrying...')
+
     def process(self, mp3):
         info = self.identify_song(mp3)
         mp3.title = metadata.normalize_string(info['title'])
@@ -74,11 +76,12 @@ class MetadataFixer(object):
                 log.info('found: %s / %s' % (mp3.artist, mp3.title))
                 n_ok += 1
             except NoMetadataError:
+                mp3.state = MP3.ERROR
                 n_err += 1
             except Exception, e:
                 log.error(traceback.format_exc())
                 n_err += 1
-                #mp3.state = MP3.ERROR
+                mp3.state = MP3.ERROR
             Session.add(mp3)
         Session.commit()
         self.idx.commit()