Fixed problems when the project specified an empty wks (KiCad 5)

This commit is contained in:
Salvador E. Tropea 2022-04-11 14:50:17 -03:00
parent 5c2afef51e
commit 09cfa14896
1 changed files with 12 additions and 9 deletions

View File

@ -418,16 +418,17 @@ class KiConf(object):
for c, line in enumerate(lns): for c, line in enumerate(lns):
if line.startswith('PageLayoutDescrFile='): if line.startswith('PageLayoutDescrFile='):
fname = line[20:].strip() fname = line[20:].strip()
logger.error(fname) if fname:
fname = KiConf.expand_env(fname) fname = KiConf.expand_env(fname)
logger.error(fname) if os.path.isfile(fname):
if os.path.isfile(fname): dest = os.path.join(dest_dir, str(order)+'.kicad_wks')
dest = os.path.join(dest_dir, str(order)+'.kicad_wks') copy2(fname, dest)
copy2(fname, dest) order = order+1
order = order+1 else:
logger.error('Missing page layout file: '+fname)
exit(MISSING_WKS)
else: else:
logger.error('Missing page layout file: '+fname) dest = ''
exit(MISSING_WKS)
lns[c] = 'PageLayoutDescrFile='+dest+'\n' lns[c] = 'PageLayoutDescrFile='+dest+'\n'
with open(project, 'wt') as f: with open(project, 'wt') as f:
lns = f.writelines(lns) lns = f.writelines(lns)
@ -444,4 +445,6 @@ class KiConf(object):
def expand_env(name, used_extra=None): def expand_env(name, used_extra=None):
if used_extra is None: if used_extra is None:
used_extra = [False] used_extra = [False]
if not name:
return name
return os.path.abspath(expand_env(un_quote(name), KiConf.kicad_env, GS.load_pro_variables(), used_extra)) return os.path.abspath(expand_env(un_quote(name), KiConf.kicad_env, GS.load_pro_variables(), used_extra))