Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace os.system with subprocess.call in setup.py

Browse Source
This commit is contained in:
Nick Hall 2023-07-14 20:23:22 +01:00
parent d858f86a18
commit cea2da1b3c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup.py
View File

@ -99,8 +99,8 @@ def build_trans(build_cmd):
os.makedirs(mo_dir) os.makedirs(mo_dir)
if newer(po_file, mo_file): if newer(po_file, mo_file):
cmd = 'msgfmt %s -o %s' % (po_file, mo_file) cmd = ['msgfmt', po_file, '-o', mo_file]
if os.system(cmd) != 0: if subprocess.call(cmd) != 0:
os.remove(mo_file) os.remove(mo_file)
msg = 'ERROR: Building language translation files failed.' msg = 'ERROR: Building language translation files failed.'
ask = msg + '\n Continue building y/n [n] ' ask = msg + '\n Continue building y/n [n] '
@ -181,13 +181,8 @@ def merge(in_file, out_file, option, po_dir='po'):
Run the msgfmt command. Run the msgfmt command.
''' '''
if (not os.path.exists(out_file) and os.path.exists(in_file)): if (not os.path.exists(out_file) and os.path.exists(in_file)):
cmd = (('GETTEXTDATADIR=%(po_dir)s msgfmt %(opt)s ' cmd = ['msgfmt', option, '--template', in_file, '-d', po_dir, '-o', out_file]
'--template %(in_file)s -d %(po_dir)s -o %(out_file)s') % if subprocess.call(cmd, env={'GETTEXTDATADIR': po_dir}) != 0:
{'opt' : option,
'po_dir' : po_dir,
'in_file' : in_file,
'out_file' : out_file})
if os.system(cmd) != 0:
msg = ('ERROR: %s was not merged into the translation files!\n' % msg = ('ERROR: %s was not merged into the translation files!\n' %
out_file) out_file)
raise SystemExit(msg) raise SystemExit(msg)