[SCM] morituri/master: * morituri/rip/cd.py: Ouch, was using the DISC TEMPLATE for the tracks.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0157c084a1c23e27c2421d73848356c2e6618497
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue May 31 08:25:01 2011 +0000

    	* morituri/rip/cd.py:
    	  Ouch, was using the DISC TEMPLATE for the tracks.

diff --git a/ChangeLog b/ChangeLog
index 01aa375..b31f11d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-31  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/rip/cd.py:
+	  Ouch, was using the DISC TEMPLATE for the tracks.
+
 2011-05-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/test/test_common_program.py:
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 85b0007..9768401 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -76,7 +76,7 @@ filling in the variables and expanding the file extension. Variables are:
             action="store", dest="track_template",
             help="template for track file naming (default %s)" %
                 DEFAULT_TRACK_TEMPLATE,
-            default=DEFAULT_DISC_TEMPLATE)
+            default=DEFAULT_TRACK_TEMPLATE)
         self.parser.add_option('', '--disc-template',
             action="store", dest="disc_template",
             help="template for disc file naming (default %s)" %

-- 
morituri packaging