Package: jack / 3.1.1+cvs20050801-31

28_allow_edit_cddb.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
25
26
27
28
29
30
31
32
33
34
Debian used --edit-cddb for a few months, but upstream changed the option
to --edit-freedb for consistency.  Allow --edit-cddb to continue to work,
but only for backwards compatibility, i.e. print a warning.

diff -urN a/jack_checkopts.py jack-3.1.1+cvs20050801/jack_checkopts.py
--- a/jack_checkopts.py	2006-02-05 15:54:03.000000000 +0000
+++ jack-3.1.1+cvs20050801/jack_checkopts.py	2006-02-05 17:27:40.000000000 +0000
@@ -59,6 +59,10 @@
     if cf2.has_key('freedb_rename') and cf2['freedb_rename']['val']:
         cf.rupdate({'read_freedb_file': {'val': 1}, 'set_id3tag':{'val': 1}}, "check")
 
+    if cf2.has_key('edit_cddb'):
+        warning("--edit-cddb is obsolete, please use --edit-freedb")
+        cf.rupdate({'edit_freedb': {'val': 1}}, "check")
+
     if cf2.has_key('id3_genre_txt'):
         genre = jack_functions.check_genre_txt(cf2['id3_genre_txt']['val'])
         if genre != cf['_id3_genre']:
diff -urN a/jack_config.py jack-3.1.1+cvs20050801/jack_config.py
--- a/jack_config.py	2006-02-05 15:54:03.000000000 +0000
+++ jack-3.1.1+cvs20050801/jack_config.py	2006-02-05 17:24:46.000000000 +0000
@@ -524,6 +524,12 @@
         'usage': "continue without freedb data if query fails",
         'long': 'AUTO',
         },
+    'edit_cddb': {
+        # For backwards compatibility only, use edit_freedb instead!
+        'type': 'toggle',
+        'val': 0,
+        'long': 'AUTO',
+        },
     'edit_freedb': {
         'type': 'toggle',
         'val': 0,