[SCM] morituri/master: we already get the version some other way

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


The following commit has been merged in the master branch:
commit 7ba5f24f7ac7cd964c7bf641f1c6ca407de0eec8
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat Jul 13 17:32:59 2013 +0200

    we already get the version some other way

diff --git a/morituri/common/program.py b/morituri/common/program.py
index 1b7ea61..685a3ad 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -133,7 +133,7 @@ class Program(log.Loggable):
             ptoc.persist(t.table)
         toc = ptoc.object
         assert toc.hasTOC()
-        return (toc, version) 
+        return toc
 
     def getTable(self, runner, cddbdiscid, mbdiscid, device):
         """
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 444ee18..c2acb28 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -69,7 +69,7 @@ class _CD(logcommand.LogCommand):
         self.program.unmountDevice(self.device)
 
         # first, read the normal TOC, which is fast
-        self.ittoc, version = self.program.getFastToc(self.runner,
+        self.ittoc = self.program.getFastToc(self.runner,
             self.options.toc_pickle,
             self.device)
 

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list