Merge pull request #144 from psychomario/development

Fix stupid bug for release
pypxe · Dec 26, 2016 · 6cc6b51 · 6cc6b51
2 parents 03652e4 + 04917bb
commit 6cc6b51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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

diff --git 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',