Fix incorrect topology path when running on Windows

Fixes #9
TwoWheelDev · Sep 9, 2014 · 95864e9 · 95864e9
1 parent fe44315
commit 95864e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/gns3converter/converter.py b/gns3converter/converter.py
@@ -78,10 +78,10 @@ def read_topology(self):
                                    encoding='utf-8')
             except SyntaxError:
                 logging.error('Error loading .net file')
-                exit()
+                sys.exit(1)
         except IOError:
             logging.error('Cannot open topology file')
-            exit()
+            sys.exit(1)
 
         vtor = Validator()
         res = config.validate(vtor, preserve_errors=True)

diff --git a/gns3converter/main.py b/gns3converter/main.py
@@ -46,6 +46,9 @@ def main():
     logging.getLogger(__name__)
 
     # Add the main topology to the list of files to convert
+    if args.topology == 'topology.net':
+        args.topology = os.path.join(os.getcwd(), 'topology.net')
+
     topology_files = [{'file': topology_abspath(args.topology),
                        'snapshot': False}]