Just for the record, here are the patches.
-- 
Martin Michlmayr
http://www.cyrius.com/
There's no reason to unset _set_id3tag when query on start fails.  This
sound wrong, but seems like the right thing to do for two reasons:
 1. Someone might have edited jack.freedb manually
 2. When FreeDB data is missing that jack absolutely needs, it will print
    an error and quit anyway.

See Debian bug #441270 for more background about this.

--- /usr/share/python-support/jack/jack_prepare.py      2007-10-21 
16:54:00.000000000 +0200
+++ /usr/share/python-support/jack/jack_prepare.py      2007-10-21 
17:28:23.000000000 +0200
@@ -507,7 +507,6 @@
             if not x or x[0].upper() != "Y":
                 sys.exit(0)
             cf['_query_on_start'] = 0
-            cf['_set_id3tag'] = 0
         else:
             jack_display.exit()
 
When query_on_start fails and cont_failed_query is set, ask the user
whether they want to edit the FreeDB file.  Based on discussion with
a user, see Debian bug #441270.

--- /usr/share/python-support/jack/jack_prepare.py      2007-10-21 
17:28:37.000000000 +0200
+++ /usr/share/python-support/jack/jack_prepare.py      2007-10-21 
17:30:34.000000000 +0200
@@ -506,7 +506,12 @@
             x = raw_input("\nfreedb search failed, continue? (y/N) ") + "x"
             if not x or x[0].upper() != "Y":
                 sys.exit(0)
-            cf['_query_on_start'] = 0
+            if not cf['_edit_freedb']:
+                x = raw_input("\nDo you want to edit the freedb data? (y/N) ") 
+ "x"
+                if x and x[0].upper() == "Y":
+                    cf['_edit_freedb'] = 1
+                else:
+                    cf['_query_on_start'] = 0
         else:
             jack_display.exit()
 

Reply via email to