[SCM] morituri/master: return cdrdao version used

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e3d7f0ab77bb6d8d3a967f4ce31c6b4ba23c89f
Author: Velo Superman <supermanvelo at gmail.com>
Date:   Sun Mar 3 17:55:10 2013 +0100

    return cdrdao version used

diff --git a/morituri/common/program.py b/morituri/common/program.py
index 5baf0e6..bac1d69 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -101,8 +101,9 @@ class Program(log.Loggable):
     def getFastToc(self, runner, toc_pickle, device):
         """
         Retrieve the normal TOC table from a toc pickle or the drive.
+        Also retrieves the cdrdao version
 
-        @rtype: L{table.Table}
+        @rtype: tuple of L{table.Table}, str
         """
         def function(r, t):
             r.run(t)
@@ -132,7 +133,7 @@ class Program(log.Loggable):
             ptoc.persist(t.table)
         toc = ptoc.object
         assert toc.hasTOC()
-        return toc
+        return (toc, version) 
 
     def getTable(self, runner, cddbdiscid, mbdiscid, device):
         """
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 436b6ba..e6e888a 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -64,10 +64,8 @@ class _CD(logcommand.LogCommand):
         self.program.loadDevice(self.device)
         self.program.unmountDevice(self.device)
 
-        version = None
-
         # first, read the normal TOC, which is fast
-        self.ittoc = self.program.getFastToc(self.runner,
+        self.ittoc, version = self.program.getFastToc(self.runner,
             self.options.toc_pickle,
             self.device)
 

-- 
morituri packaging