[SCM] morituri/master: now take relative from currentFile

[js at users.alioth.debian.org]

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

    now take relative from currentFile

diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index e0b4656..9cc0c89 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -200,7 +200,7 @@ class TocFile(object, log.Loggable):
                     # FIXME: why not set absolute offsets too ?
                     currentTrack.index(1, path=currentFile.path,
                         absolute=absoluteOffset + pregapLength,
-                        relative=relativeOffset + pregapLength,
+                        relative=currentFile.start + pregapLength,
                         counter=counter)
                     self.debug(
                         '[track %02d index 01] pregapLength %r, added %r',
@@ -339,7 +339,7 @@ class TocFile(object, log.Loggable):
         if currentTrack:
             currentTrack.index(1, path=currentFile.path,
                 absolute=absoluteOffset + pregapLength,
-                relative=relativeOffset + pregapLength, counter=counter)
+                relative=currentFile.start, counter=counter)
             self.debug('[track %02d index 01] last track, added %r',
                 currentTrack.number, currentTrack.getIndex(1))
 

-- 
morituri packaging