[SCM] morituri/master: update logging; bump classVersion of Table

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 307db4f59f8639d6837665e0a6d4fe6f47970256
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue Mar 5 16:59:38 2013 +0100

    update logging; bump classVersion of Table
    
    now table will get a logName set correctly when unpickled too

diff --git a/morituri/common/program.py b/morituri/common/program.py
index 73385b9..af17c92 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -150,8 +150,12 @@ class Program(log.Loggable):
             t = cdrdao.ReadTableTask(device=device)
             runner.run(t)
             ptable.persist(t.table)
+            self.debug('getTable: read table %r' % t.table)
         else:
-            self.debug('getTable: cddbdiscid %s in cache' % cddbdiscid)
+            self.debug('getTable: cddbdiscid %s, mbdiscid %s in cache' % (
+                cddbdiscid, mbdiscid))
+            ptable.object.unpickled()
+            self.debug('getTable: loaded table %r' % ptable.object)
         itable = ptable.object
         assert itable.hasTOC()
 
diff --git a/morituri/image/table.py b/morituri/image/table.py
index 18e9efb..9ea055c 100644
--- a/morituri/image/table.py
+++ b/morituri/image/table.py
@@ -168,7 +168,7 @@ class Table(object, log.Loggable):
     catalog = None # catalog number; FIXME: is this UPC ?
     cdtext = None
 
-    classVersion = 2
+    classVersion = 3
 
     def __init__(self, tracks=None):
         if not tracks:
@@ -176,10 +176,14 @@ class Table(object, log.Loggable):
 
         self.tracks = tracks
         self.cdtext = {}
-        self.logName = "Table 0x%08X" % id(self)
         # done this way because just having a class-defined instance var
         # gets overridden when unpickling
         self.instanceVersion = self.classVersion
+        self.unpickled()
+
+    def unpickled(self):
+        self.logName = "Table 0x%08x v%d" % (id(self), self.instanceVersion)
+        self.debug('set logName')
 
     def getTrackStart(self, number):
         """
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index 9382dc2..f84227c 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -305,7 +305,7 @@ class TocFile(object, log.Loggable):
 
         # totalLength was added up to the penultimate track
         self.table.leadout = totalLength + currentLength
-        self.debug('leadout: %r', self.table.leadout)
+        self.debug('parse: leadout: %r', self.table.leadout)
 
     def message(self, number, message):
         """

-- 
morituri packaging