From cc4de19dfdab9a835029117b54602642429db25a Mon Sep 17 00:00:00 2001 From: Rory McNamara Date: Mon, 26 Dec 2016 19:42:26 +0000 Subject: [PATCH 1/2] fix stupid config bug --- pypxe/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pypxe/server.py b/pypxe/server.py index f72b4a3..e4dea8d 100755 --- a/pypxe/server.py +++ b/pypxe/server.py @@ -134,7 +134,8 @@ def main(): settings = args.__dict__ del settings['DUMP_CONFIG'] del settings['DUMP_CONFIG_MERGED'] - print json.dumps(SETTINGS, sort_keys=True, indent=4) + del settings['JSON_CONFIG'] + print json.dumps(settings, sort_keys=True, indent=4) sys.exit() if args.JSON_CONFIG: # load from configuration file if specified From 04917bb02d763dc1d16cc881b8ce71dddf49ebd1 Mon Sep 17 00:00:00 2001 From: Rory McNamara Date: Mon, 26 Dec 2016 19:42:46 +0000 Subject: [PATCH 2/2] version bump to release previous --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0af3827..0929af6 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ deps.append('argparse') setup(name='PyPXE', - version='1.7.1', + version='1.7.2', description='Pure Python2 PXE (DHCP-(Proxy)/TFTP/HTTP/NBD) Server', url='https://github.com/psychomario/PyPXE', license='MIT',