[SCM] morituri/master: patch by: Loïc Minier <lool at dooz.org> * morituri/rip/cd.py: Don't strip extension of HTOA track. Fixes #50.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 24afc106f9e5b1df14148333c78744af93731f7e
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun May 22 11:10:26 2011 +0000

    	patch by: Loïc Minier <lool at dooz.org>
    	* morituri/rip/cd.py:
    	  Don't strip extension of HTOA track.
    	  Fixes #50.

diff --git a/ChangeLog b/ChangeLog
index b3d4244..7baad40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	patch by: Loïc Minier <lool at dooz.org>
+
+	* morituri/rip/cd.py:
+	  Don't strip extension of HTOA track.
+	  Fixes #50.
+
+2011-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/result/logger.py:
 	  Always write strftime in C locale.  Fixes second bug
 	  mentioned in #49.
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index ef0481a..116b498 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -277,7 +277,7 @@ See  http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=1
         if htoapath:
             u = u'#EXTINF:%d,%s\n' % (
                 itable.getTrackStart(1) / common.FRAMES_PER_SECOND,
-                    os.path.basename(htoapath[:-4]))
+                    os.path.basename(htoapath))
             handle.write(u.encode('utf-8'))
             u = '%s\n' % os.path.basename(htoapath)
             handle.write(u.encode('utf-8'))

-- 
morituri packaging