[SCM] morituri/master: * morituri/common/program.py: * morituri/rip/cd.py: Reset rip duration when we continue a rip but have to rerip a track.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f0cb567a0dbdc86e188268dd608d38f525d65a3b
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Nov 28 08:19:43 2012 +0000

    	* morituri/common/program.py:
    	* morituri/rip/cd.py:
    	  Reset rip duration when we continue a rip but have to rerip
    	  a track.

diff --git a/ChangeLog b/ChangeLog
index 41fba5f..a1c2c42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/program.py:
+	* morituri/rip/cd.py:
+	  Reset rip duration when we continue a rip but have to rerip
+	  a track.
+
 2012-11-27  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/program.py:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 76d9c1d..6a6d2c8 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -470,6 +470,11 @@ class Program(log.Loggable):
 
         runner.run(t)
 
+        self.debug('ripped track')
+        self.debug('test speed %.3f/%.3f seconds' % (
+            t.testspeed, t.testduration))
+        self.debug('copy speed %.3f/%.3f seconds' % (
+            t.copyspeed, t.copyduration))
         trackResult.testcrc = t.testchecksum
         trackResult.copycrc = t.copychecksum
         trackResult.peak = t.peak
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 67a9420..90f4333 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -260,7 +260,11 @@ See  http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=1
                     os.unlink(path)
 
             if not os.path.exists(path):
+                self.debug('path %r does not exist, ripping...' % path)
                 tries = 0
+                # we reset durations for test and copy here
+                trackResult.testduration = 0.0
+                trackResult.copyduration = 0.0
                 self.stdout.write('Ripping track %d of %d: %s\n' % (
                     number, len(itable.tracks),
                     os.path.basename(path).encode('utf-8')))

-- 
morituri packaging