anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Remove checks for individual cardsets' COPYRIGHT files

Browse source 
It is not strictly necessary to check the presence of the COPYRIGHT file
since pysollib/{tile,tk}/selectcardset.py will work even if it's missing.

In the Debian package, individual COPYRIGHT files are missing as all license
information should be in one file anyway, /usr/share/doc/pysolfc/copyright.

Thanks to Bernhard Reiter who originally wrote this patch:
https://salsa.debian.org/games-team/pysolfc/blob/87493fb/debian/patches/remove_checks_for_copyright_files
This commit is contained in:
Juhani Numminen 2019-07-27 20:51:41 +03:00 • committed by Shlomi Fish
parent 1137dbb39b
commit 26631a7a22
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pysollib/app.py
View file

@ -1211,11 +1211,10 @@ Please select a %s type %s.
d = os.path.join(dirname, name) d = os.path.join(dirname, name)
if not os.path.isdir(d): if not os.path.isdir(d):
continue continue
f1 = os.path.join(d, "config.txt") f = os.path.join(d, "config.txt")
f2 = os.path.join(d, "COPYRIGHT") if os.path.isfile(f):
if os.path.isfile(f1) and os.path.isfile(f2):
try: try:
cs = self._readCardsetConfig(d, f1) cs = self._readCardsetConfig(d, f)
if cs: if cs:
# from pprint import pprint # from pprint import pprint
# print cs.name # print cs.name
@ -1232,7 +1231,7 @@ Please select a %s type %s.
fnames[cs.name] = 1 fnames[cs.name] = 1
else: else:
print_err('fail _readCardsetConfig: %s %s' print_err('fail _readCardsetConfig: %s %s'
% (d, f1)) % (d, f))
pass pass
except Exception: except Exception:
# traceback.print_exc() # traceback.print_exc()