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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
Description: Remove checks for individual cardsets' COPYRIGHT files
which we remove in order to comply with Debian policy.
Author: Bernhard Reiter <ockham@raz.or.at>
Forwarded: not-needed
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -1469,11 +1469,10 @@
d = os.path.join(dir, name)
if not os.path.isdir(d):
continue
- f1 = os.path.join(d, "config.txt")
- f2 = os.path.join(d, "COPYRIGHT")
- if os.path.isfile(f1) and os.path.isfile(f2):
+ f = os.path.join(d, "config.txt")
+ if os.path.isfile(f):
try:
- cs = self._readCardsetConfig(d, f1)
+ cs = self._readCardsetConfig(d, f)
if cs:
# from pprint import pprint
# print cs.name
@@ -1490,7 +1489,7 @@
fnames[cs.name] = 1
else:
print_err('fail _readCardsetConfig: %s %s'
- % (d, f1))
+ % (d, f))
pass
except Exception:
# traceback.print_exc()
--- a/pysollib/tile/selectcardset.py
+++ b/pysollib/tile/selectcardset.py
@@ -523,15 +523,12 @@
frame.columnconfigure(0, weight=1)
frame.rowconfigure(1, weight=1)
#
- text = ''
- f = os.path.join(cardset.dir, "COPYRIGHT")
- try:
- text = open(f).read()
- except Exception:
- pass
- if text:
- text_w.config(state="normal")
- text_w.insert("insert", text)
+ text = '''\
+Copyright and license information for all cardsets and
+other game components can be found in the file
+/usr/share/doc/pysolfc/copyright
+'''
+ text_w.insert("insert", text)
text_w.config(state="disabled")
#
focus = self.createButtons(bottom_frame, kw)
--- a/pysollib/tk/selectcardset.py
+++ b/pysollib/tk/selectcardset.py
@@ -486,15 +486,12 @@
frame.columnconfigure(0, weight=1)
frame.rowconfigure(1, weight=1)
#
- text = ''
- f = os.path.join(cardset.dir, "COPYRIGHT")
- try:
- text = open(f).read()
- except Exception:
- pass
- if text:
- text_w.config(state="normal")
- text_w.insert("insert", text)
+ text = '''
+Copyright and license information for all cardsets and
+other game components can be found in the file
+/usr/share/doc/pysolfc/copyright
+'''
+ text_w.insert("insert", text)
text_w.config(state="disabled")
#
focus = self.createButtons(bottom_frame, kw)
|
