mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

main: catch ArgvParseError and don't display traceback

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2020-05-12 18:44:15 +02:00
parent 4d9f4e59f3
commit b8ab3d5d7b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ifupdown2/__main__.py
View File

@@ -46,7 +46,7 @@ try:
from ifupdown2.lib.exceptions import ExitWithStatus, ExitWithStatusAndError
from ifupdown2.ifupdown.client import Client
from ifupdown2.ifupdown.exceptions import ArgvParseHelp
from ifupdown2.ifupdown.exceptions import ArgvParseHelp, ArgvParseError
except:
import ifupdown.config as config
@@ -55,7 +55,7 @@ except:
from lib.exceptions import ExitWithStatus, ExitWithStatusAndError
from ifupdown.client import Client
from ifupdown.exceptions import ArgvParseHelp
from ifupdown.exceptions import ArgvParseHelp, ArgvParseError
def daemon_mode():
@@ -92,6 +92,9 @@ def stand_alone():
try:
ifupdown2.parse_argv(sys.argv)
LogManager.get_instance().start_standalone_logging(ifupdown2.args)
except ArgvParseError as e:
LogManager.get_instance().root_logger().error(str(e))
return Status.Client.STATUS_ARGV_ERROR
except ArgvParseHelp:
# on --help parse_args raises SystemExit, we catch it and raise a
# custom exception ArgvParseHelp to return 0