luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1414 from antmicro/fix-output-arg 

Move setting output path to `run` function
This commit is contained in:
Alessandro Comodi 2020-10-05 14:21:03 +02:00 committed by GitHub
parent 2e96cd2781 0b28b67bd3
commit 31969e8860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htmlgen/htmlgen.py
View File

@ -966,6 +966,10 @@ def run(settings, output, verbose=False, allow_fake=False):
get_setting = mk_get_setting(settings)
if output is None:
output = os.path.join(
os.path.curdir, 'html', get_setting('XRAY_DATABASE'))
db_dir = os.path.join(
get_setting("XRAY_DATABASE_DIR"), get_setting("XRAY_DATABASE"))
@ -999,8 +1003,7 @@ def main():
parser.add_argument('--verbose', action='store_true')
parser.add_argument(
'--output',
default=os.path.join(
os.path.curdir, 'html', get_setting('XRAY_DATABASE')),
default=None,
help='Put the generated files in this directory (default current dir).'
)
parser.add_argument(