← Back to branch summary

~ubuntu-branches/ubuntu/raring/cdrdao/raring

« back to all changes in this revision

Viewing changes to debian/patches/06-tocparser.patch

  • Committer: Steve Langasek
  • Date: 2010-06-05 01:39:39 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: vorlon@debian.org-20100605013939-24q8uzfgdzklqgdn
merge version 1:1.2.2-18.2ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06-tocparser.patch
 
1
Author: Florian Forster <octo@verplant.org>
 
2
Description:
 
3
 Undo upstream removal of automatic reading of the track lengths in TOC files
 
4
 (Closes: #440419).
 
5
 
 
6
diff -Naurp cdrdao.orig/trackdb/TocParser.g cdrdao/trackdb/TocParser.g
 
7
--- cdrdao.orig/trackdb/TocParser.g     2009-06-14 08:36:45.000000000 +0000
 
8
+++ cdrdao/trackdb/TocParser.g  2009-07-16 22:49:20.000000000 +0000
 
9
@@ -496,6 +496,15 @@ subTrack < [ TrackData::Mode trackType, 
 
10
          }
 
11
        >>
 
12
     )
 
13
+    << if ($st != NULL && $st->length() == 0) {
 
14
+         // try to determine length 
 
15
+         if ($st->determineLength() != 0) {
 
16
+          message(-2, "%s:%d: Cannot determine length of track data specification.",
 
17
+                  filename_, $lineNr);
 
18
+          error_ = 1;
 
19
+        }
 
20
+       }
 
21
+    >> 
 
22
     ;
 
23
     // fail action
 
24
     << delete $st, $st = NULL;