Commit 767e6793 authored by Ulysse Beaugnon's avatar Ulysse Beaugnon

Merge branch 'master' of https://git.erp5.org/repos/vifibnet

parents 17d121a8 49685121
...@@ -13,3 +13,4 @@ The organisation of the code ...@@ -13,3 +13,4 @@ The organisation of the code
tunnel.py To choose wich connection delete/keep/... tunnel.py To choose wich connection delete/keep/...
upnpigd.py To open a port upnpigd.py To open a port
...@@ -7,9 +7,11 @@ import db, plib, upnpigd, utils, tunnel ...@@ -7,9 +7,11 @@ import db, plib, upnpigd, utils, tunnel
class ArgParser(ArgumentParser): class ArgParser(ArgumentParser):
def convert_arg_line_to_args(self, arg_line): def convert_arg_line_to_args(self, arg_line):
for arg in ('--' + arg_line.lstrip('--')).split(): arg_line = arg_line.split('#')[0].rstrip()
if arg.strip(): if arg_line:
yield arg for arg in ('--' + arg_line.lstrip('--')).split():
if arg.strip():
yield arg
def ovpnArgs(optional_args, ca_path, cert_path): def ovpnArgs(optional_args, ca_path, cert_path):
# Treat openvpn arguments # Treat openvpn arguments
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment