[SCM] morituri/master: create index with the correct path by using sources

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


The following commit has been merged in the master branch:
commit 142fa9e33eb0589205e7280ef862dd7bf2797211
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Aug 18 21:59:43 2013 +0200

    create index with the correct path by using sources

diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index 1b7d29f..e0b4656 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -309,10 +309,11 @@ class TocFile(object, log.Loggable):
                     continue
 
                 length = common.msfToFrames(m.group('length'))
-                currentTrack.index(0, path=currentFile.path,
+                c, o, s = sources.get(absoluteOffset)
+                currentTrack.index(0, path=s and s.path or None,
                     absolute=absoluteOffset,
-                    relative=relativeOffset, counter=counter)
-                self.debug('track %d, added index %r',
+                    relative=relativeOffset, counter=c)
+                self.debug('[track %2d index 00] added %r',
                     currentTrack.number, currentTrack.getIndex(0))
                 # store the pregapLength to add it when we index 1 for this
                 # track on the next iteration

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list