[SCM] morituri/master: remove one if path

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:10:09 UTC 2014


The following commit has been merged in the master branch:
commit 6eda5d7dc51b2c5083db2e86ec45597ce50bebb5
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue Jul 30 13:25:28 2013 +0200

    remove one if path

diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index 88a1ae6..f84f101 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -221,17 +221,11 @@ def _getMetadata(releaseShort, release, discid):
                         log.debug('mbngs',
                             'artist-credit more than 1: %r', trackCredit)
 
-                    trackArtistName = trackCredit.getName()
-
-                    if not discArtist:
-                        track.artist = discMD.artist
-                        track.sortName = discMD.sortName
-                        track.mbidArtist = discMD.mbidArtist
-                    else:
-                        # various artists discs can have tracks with no artist
-                        track.artist = trackArtistName
-                        track.sortName = trackCredit.getSortName()
-                        track.mbidArtist = trackCredit.getIds()
+                    # FIXME: leftover comment, need an example
+                    # various artists discs can have tracks with no artist
+                    track.artist = trackCredit.getName()
+                    track.sortName = trackCredit.getSortName()
+                    track.mbidArtist = trackCredit.getIds()
 
                     track.title = t['recording']['title']
                     track.mbid = t['recording']['id']

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list