Package: jack / 3.1.1+cvs20050801-31

34_toc_invocation_fail.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
The error message when the toc program fails is misleading.  Improve the
message and remove some code that is not needed because it's tested
elsewhere already.  Debian #360465.

--- a/jack_functions.py~	2006-05-16 16:40:17.000000000 +0200
+++ b/jack_functions.py	2006-05-16 16:40:36.000000000 +0200
@@ -119,16 +119,7 @@
         l = p.readline()
         exec(jack_helpers.helpers[toc_prog]['toc_fkt'])
         if p.close():
-            if cf['_cd_device']:
-                try:
-                    f = open(cf['_cd_device'], "r")
-                except IOError:
-                     info("could not open " + cf['_cd_device'] + ". Check permissions and that a disc is inserted.")
-                else:
-                    info("maybe " + toc_prog + " is not installed?")
-            else:
-                info("try setting cf['_cd_device'] to your CD device, e.g. /dev/cdrom")
-            error("could not read CD's TOC.")
+            error("%s failed - could not read CD's TOC." % toc_prog)
         else:
             return erg
     else: